Cleanup

[sid.git] / sid / feeds.py

diff --git a/sid/feeds.py b/sid/feeds.py
index ae07005b9c268dcefa49e56db6d6f597811637b9..2cb0964646276bf0ec2e7c5529d18ecb99731b07 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -58,23 +58,23 @@ class FeedMonitor(threading.Thread):
 
         # Cannot resolve address
         if 'status' not in parsed_feed:
-            self.plugin.log.error('Error from "%s": %s.' %
-                    (feed, parsed_feed.bozo_exception.__repr__()))
+            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.plugin.log.error(
-                'Got code %(status)d from "%(href)s" (please update).' %
-                    parsed_feed)
+            self.plugin.log.warning(
+                'Got code %(status)d from "%(href)s" (please update).',
+                parsed_feed)
             return
 
         feed_updated = parsed_feed.feed.get('updated_parsed', None)
 
         # Avoid looping over all posts if possible
         if feed_updated and strtm_to_dtm(feed_updated) < self.last_check:
-            self.plugin.log.debug('updated   : %s' % strtm_to_dtm(feed_updated))
-            self.plugin.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')
@@ -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:
@@ -115,7 +117,7 @@ class FeedMonitor(threading.Thread):
                 try:
                     self.new_posts(feed)
                 except Exception as err:
-                    self.plugin.log.error('feeds thread crashed: %s' % err)
+                    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()
@@ -134,14 +136,12 @@ class Feeds(Plugin):
         # not working <http://bugs.debian.org/612274>
         # 'http://www.debian.org/News/news',
 
-        # DPN in french
-       'http://www.debian.org/News/weekly/dwn.fr.rdf',
+        # Some packages
+        'https://tracker.debian.org/pkg/prosody/rss',
+        'https://tracker.debian.org/pkg/ejabberd/rss',
 
         # Misc
-       'http://rss.gmane.org/topics/excerpts/gmane.linux.debian.devel.announce',
-       'http://rss.gmane.org/gmane.linux.debian.user.security.announce',
-       'http://planet-fr.debian.net/users/rss20.xml',
-       'http://planet.debian.org/atom.xml',
+        'http://planet.debian.org/atom.xml',
         ]
 
     def __init__(self, bot):
@@ -154,16 +154,16 @@ 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(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)
+        html = ['<a href="{0}">{1}</a>'.format(html_escape(u),
+                                               html_escape(u[7:])
+                                              ) for u in Feeds.FEEDS]
+        msg = {'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
+               'mhtml': 'Feeds:<br />' + '<br />'.join(html),}
+        self.reply(rcv, msg)