Switch to SPDX headers

[sid.git] / sid / feeds.py

diff --git a/sid/feeds.py b/sid/feeds.py
index dc979e5e7c206d51ad5c30449e9d99cbf280606b..466aaece82ee6f0554bd81fb3883b946f1796fd2 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -1,18 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Copyright (C) 2011, 2014, 2020 kaliko <kaliko@azylum.org>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 only.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2011, 2014, 2020 kaliko <kaliko@azylum.org>
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import datetime
 import threading
@@ -20,6 +8,7 @@ import time
 import traceback
 
 from urllib.error import URLError
+from urllib.parse import urlparse
 
 from feedparser import parse as feed_parse
 
@@ -177,9 +166,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)