Improve the simple_notify plugin and the daemon to execute a command to clean the notification and to execute the remote commands through sh -c, letting us use pipes and redirections. Also adds the highlight event for plugin, and make the simple_notify plugin use it as well.

1 files changed, 11 insertions, 0 deletions

diff --git a/plugins/simple_notify.py b/plugins/simple_notify.py
index 61045130..bc31c961 100644
--- a/plugins/simple_notify.py
+++ b/plugins/simple_notify.py
@@ -1,15 +1,21 @@
 from plugin import BasePlugin
 from xhtml import clean_text, get_body_from_message_stanza
+from timed_events import DelayedEvent
 
 class Plugin(BasePlugin):
     def init(self):
         self.add_event_handler('private_msg', self.on_private_msg)
         self.add_event_handler('conversation_msg', self.on_conversation_msg)
+        self.add_event_handler('highlight', self.on_highlight)
 
     def on_private_msg(self, message, tab):
         fro = message['from']
         self.do_notify(message, fro)
 
+    def on_highlight(self, message, tab):
+        fro = message['from'].resource
+        self.do_notify(message, fro)
+
     def on_conversation_msg(self, message, tab):
         fro = message['from'].bare
         self.do_notify(message, fro)
@@ -23,3 +29,8 @@ class Plugin(BasePlugin):
             self.core.information('No notification command was provided in the configuration file', 'Warning')
             return
         self.core.exec_command(command % {'body':body, 'from':fro})
+        after_command = self.config.get('after_command', '').strip()
+        if not after_command:
+            return
+        delayed_event = DelayedEvent(self.config.get('delay', 1), self.core.exec_command, after_command % {'body':body, 'from':fro})
+        self.core.add_timed_event(delayed_event)