Moved the send logic to Plugin

diff --git a/sid/echo.py b/sid/echo.py
index aec0b9d9c954e65f7f6c4b3db1ef716b5e06f1b6..bb7e66a8163ae6246ba84b14a3351f9ec62fdcd9 100644 (file)
--- a/sid/echo.py
+++ b/sid/echo.py
@@ -39,9 +39,7 @@ class Echo(Plugin):
         nick = pres['muc']['nick']
         self.online.add(nick)
         while self.inbox.get(nick, []):
-            self.bot.send_message(mto=self.bot.room,
-                              mbody=self.inbox.get(nick).pop(),
-                              mtype='groupchat')
+            self.send(self.inbox.get(nick).pop())
         self.inbox.pop(nick)
 
     def _went_offline(self, pres):
@@ -51,16 +49,19 @@ class Echo(Plugin):
 
     @botcmd
     def tell(self, message, args):
-        """drop a message to be delivred when someone gets online.
+        """drop a message to be sent when someone gets online.
         !tell queue        : messages in queue
         !tell <nick> <msg> : append <msg> to <nick> in queue"""
         if not len(args):
-            return 'Missing arguments:\n{}'.format(self.tell.__doc__)
+            self.send('Missing arguments:\n{}'.format(self.tell.__doc__))
+            return
         if len(args) == 1 and args[0] == 'queue':
-            return '\n'.join(['{0}:\n\t{1}'.format(k, '\n'.join(v))
-                              for k, v in self.inbox.items()])
+            self.send('\n'.join(['{0}:\n\t{1}'.format(k, '\n'.join(v))
+                              for k, v in self.inbox.items()]))
+            return
         if len(args) < 2:
-            return 'Please provide a message:\n{}'.format(self.tell.__doc__)
+            self.send('Please provide a message:\n{}'.format(self.tell.__doc__))
+            return
         sender = message['from'].resource
         recipient = message['body'].split()[1]
         tell_msg = ' '.join(message['body'].split()[2:])

diff --git a/sid/feeds.py b/sid/feeds.py
index f06befa062b068eae46973aca1751df5278e8172..ae07005b9c268dcefa49e56db6d6f597811637b9 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -47,31 +47,24 @@ class FeedMonitor(threading.Thread):
         threading.Thread.__init__(self)
         self.feeds_list = plugin.FEEDS
         self.tempo = plugin.TEMPO
-        self.bot = plugin.bot
+        self.plugin = plugin
         self.last_check = datetime.datetime.utcnow()
         self.seen = dict()
         self.thread_killed = False
 
-    def send(self, message):
-        """simple wrapper around bot send_message method"""
-        self.bot.send_message(mto=self.bot.room,
-                              mbody=message[1],
-                              mhtml=message[0],
-                              mtype='groupchat')
-
     def new_posts(self, feed):
         """Send new posts in feed"""
         parsed_feed = feed_parse(feed)
 
         # Cannot resolve address
         if 'status' not in parsed_feed:
-            self.bot.log.error('Error from "%s": %s.' %
+            self.plugin.log.error('Error from "%s": %s.' %
                     (feed, parsed_feed.bozo_exception.__repr__()))
             return
 
         # unusual return http code
         if parsed_feed.status != 200:
-            self.bot.log.error(
+            self.plugin.log.error(
                 'Got code %(status)d from "%(href)s" (please update).' %
                     parsed_feed)
             return
@@ -80,8 +73,8 @@ class FeedMonitor(threading.Thread):
 
         # Avoid looping over all posts if possible
         if feed_updated and strtm_to_dtm(feed_updated) < self.last_check:
-            self.bot.log.debug('updated   : %s' % strtm_to_dtm(feed_updated))
-            self.bot.log.debug('last check: %s' % self.last_check)
+            self.plugin.log.debug('updated   : %s' % strtm_to_dtm(feed_updated))
+            self.plugin.log.debug('last check: %s' % self.last_check)
             return
 
         title = '"%s":' % parsed_feed.feed.get('title', 'n/a')
@@ -94,14 +87,14 @@ class FeedMonitor(threading.Thread):
             # Fills with post id when first started (prevent from posting all
             # entries at startup)
             self.seen[feed_id] = {p.id for p in parsed_feed.entries}
-            #return
+            return
 
         # Detecting new post
         entries = {p.id for p in parsed_feed.entries}
         new_entries = [p for p in parsed_feed.entries
                        if p.id in entries - self.seen.get(feed_id)]
         for post in new_entries:
-            self.bot.log.info(post.title)
+            self.plugin.log.info(post.title)
 
             body = '%(title)s %(link)s' % post
             text.append(body)
@@ -113,18 +106,17 @@ class FeedMonitor(threading.Thread):
         # Updating self.seen
         self.seen[feed_id] = entries
         if len(text) > 1:
-            self.bot.log.debug('<br />'.join(xhtml))
-            self.send(('<br />'.join(xhtml), '\n'.join(text)))
+            self.plugin.send({'mbody':'<br />'.join(xhtml), 'mhtml':'\n'.join(text)})
 
     def run(self):
         while not self.thread_killed:
-            self.bot.log.debug('feeds check')
+            self.plugin.log.debug('feeds check')
             for feed in self.feeds_list:
                 try:
                     self.new_posts(feed)
                 except Exception as err:
-                    self.bot.log.error('feeds thread crashed: %s' % err)
-                    self.bot.log.error(''.join(traceback.format_exc()))
+                    self.plugin.log.error('feeds thread crashed: %s' % err)
+                    self.plugin.log.error(''.join(traceback.format_exc()))
                     self.thread_killed = True
             self.last_check = datetime.datetime.utcnow()
             for _ in list(range(self.tempo)):
@@ -167,5 +159,11 @@ class Feeds(Plugin):
         !feeds : registred feeds list
         !feeds last : last check time"""
         if 'last' in args:
-            return 'Last feeds check: %s' % self.th_mon.last_check
-        return '\n'.join(Feeds.FEEDS)
+            self.send('Last feeds check: %s' % self.th_mon.last_check)
+            return
+        html = ['<a href="{0}">{1}</a>'.format(u, u[7:]) for u in Feeds.FEEDS]
+        msg = {
+                'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
+                'mhtml': 'Feeds:<br />' + '<br />'.join(html)
+                }
+        self.send(msg)

diff --git a/sid/plugin.py b/sid/plugin.py
index 15f43ab55e52a7a4fb3280d22abbc970d61ddfbf..2b49bc9da22c9d3a57f1c02a6793da770a3c1221 100644 (file)
--- a/sid/plugin.py
+++ b/sid/plugin.py
@@ -23,5 +23,20 @@ class Plugin(object):
         self.bot = bot
         self.log = bot.log
 
+    def send(self, msg):
+        """
+        Send msg to the current groupchat defined in self.bot.room
+            msg = {
+                mbody: 'text',
+                mhtml: '<b>text</b>,  # optional'
+            }
+        """
+        if isinstance(msg, str):
+            msg = {'mbody':msg}
+        msg.setdefault('mhtml', None)
+        self.bot.send_message(mto=self.bot.room,
+                              mtype='groupchat',
+                              **msg)
+
     def shutdown(self):
         pass

diff --git a/sid/sid.py b/sid/sid.py
index 726f7fa9888fac496725022596f23fb0463f31aa..53fd5696976f4a60d2d01ec7ec75dfaeb4066aaf 100644 (file)
--- a/sid/sid.py
+++ b/sid/sid.py
@@ -103,14 +103,12 @@ class MUCBot(sleekxmpp.ClientXMPP):
         if args:
             self.log.debug('arg: {0}'.format(args))
         try:
-            reply = self.commands[cmd](msg, args)
+            self.commands[cmd](msg, args)
         except Exception as err:
             reply = ''.join(traceback.format_exc())
             self.log.exception('An error occurred processing: {0}: {1}'.format(body, reply))
-            self.log.info(self.log.level)
-            if self.log.level >= 20 or not reply:
-                return
-        self.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat')
+            if self.log.level < 20 and reply:
+                self.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat')
 
     def start(self, event):
         """
@@ -182,4 +180,4 @@ class MUCBot(sleekxmpp.ClientXMPP):
                 text = self.commands[args[0]].__doc__.strip() or 'undocumented'
             else:
                 text = 'That command is not defined.'
-        return text
+        self.send_message(mto=message['from'].bare, mbody=text, mtype='groupchat')