Bump slixmpp to 1.8.3

[sid.git] / sid / feeds.py

diff --git a/sid/feeds.py b/sid/feeds.py
index 1d6ed78f6e9a75b6af1744e1f066073e4eaa074f..1b31b5cf1e9bd8212d2417aca872e390f6950cf4 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -20,6 +20,7 @@ import time
 import traceback
 
 from urllib.error import URLError
+from urllib.parse import urlparse
 
 from feedparser import parse as feed_parse
 
@@ -125,9 +126,9 @@ class FeedMonitor(threading.Thread):
                 try:
                     self.new_posts(feed)
                 except ConnectionError as err:  # Non fatal exception
-                    self.plugin.log.error(f'connection error on {feed}: {err}')
+                    self.plugin.log.error('connection error on %s: %s', feed, err)
                 except URLError as err:  # Non fatal exception
-                    self.plugin.log.error(f'error for {feed}: {err.reason}')
+                    self.plugin.log.error('error for "%s": %s', feed, err.reason)
                 except Exception as err:  # Unknown execption, killing thread anyway
                     self.plugin.log.error('feeds thread crashed: %s', err)
                     self.plugin.log.error(''.join(traceback.format_exc()))
@@ -177,9 +178,10 @@ class Feeds(Plugin):
             date = '{:%Y-%m-%d %H:%M} (utc)'.format(self.th_mon.last_check)
             self.reply(rcv, f'Last feeds check: {date}')
             return
-        html = ['<a href="{0}">{1}</a>'.format(html_escape(u),
-                                               html_escape(u[7:])
-                                              ) for u in Feeds.FEEDS]
+        html = ['<a href="{0}">{1}</a>'.format(
+                                     html_escape(u),
+                                     html_escape('{1}{2}'.format(*urlparse(u)))
+                                     ) for u in Feeds.FEEDS]
         msg = {'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
                'mhtml': 'Feeds:<br />' + '<br />'.join(html)}
         self.reply(rcv, msg)