Now handles private msg in MUC

[sid.git] / sid / feeds.py

diff --git a/sid/feeds.py b/sid/feeds.py
index b3dd19f43147d857cd8f68930e4f3ef998c521e3..59cf0843c11aa4778caead41e5e1b7a55c30c015 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -64,7 +64,7 @@ class FeedMonitor(threading.Thread):
 
         # unusual return http code
         if parsed_feed.status != 200:
-            self.plugin.log.error(
+            self.plugin.log.warning(
                 'Got code %(status)d from "%(href)s" (please update).' %
                     parsed_feed)
             return
@@ -99,14 +99,16 @@ class FeedMonitor(threading.Thread):
             body = '%(title)s %(link)s' % post
             text.append(body)
 
-            xpost = dict(**post)
-            xpost['title'] = html_escape(xpost.get('title', 'n/a'))
-            xbody = '<a href="%(link)s">%(title)s</a>' % xpost
+            xpost = {'title': html_escape(post.get('title', 'n/a'))}
+            xpost['link'] = html_escape(post.get('link',))
+            xbody = '<a href="{link}">{title}</a>'.format(**xpost)
             xhtml.append(xbody)
         # Updating self.seen
         self.seen[feed_id] = entries
         if len(text) > 1:
-            self.plugin.send({'mbody':'<br />'.join(xhtml), 'mhtml':'\n'.join(text)})
+            self.plugin.send(self.plugin.bot.room,
+                    {'mhtml':'<br />'.join(xhtml), 'mbody':'\n'.join(text)},
+                    mtype='groupchat')
 
     def run(self):
         while not self.thread_killed:
@@ -154,12 +156,12 @@ class Feeds(Plugin):
         self.th_mon.thread_killed = True
 
     @botcmd
-    def feeds(self, message, args):
+    def feeds(self, rcv, args):
         """feeds monitors debian project related feeds.
         !feeds : registred feeds list
         !feeds last : last check time"""
         if 'last' in args:
-            self.send('Last feeds check: %s' % self.th_mon.last_check)
+            self.reply(rcv, 'Last feeds check: %s' % self.th_mon.last_check)
             return
         html = ['<a href="{0}">{1}</a>'.format(html_escape(u),
                                                html_escape(u[7:])
@@ -168,4 +170,4 @@ class Feeds(Plugin):
                 'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
                 'mhtml': 'Feeds:<br />' + '<br />'.join(html),
                 }
-        self.send(msg)
+        self.reply(rcv, msg)