X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sid%2Ffeeds.py;h=466aaece82ee6f0554bd81fb3883b946f1796fd2;hb=fcad55c852f786c27988697f52b1dca2d05d3626;hp=dc979e5e7c206d51ad5c30449e9d99cbf280606b;hpb=8be15ab374b0b1babafcdf01e98756c3c957c7f0;p=sid.git diff --git a/sid/feeds.py b/sid/feeds.py index dc979e5..466aaec 100644 --- a/sid/feeds.py +++ b/sid/feeds.py @@ -1,18 +1,6 @@ # -*- coding: utf-8 -*- - -# Copyright (C) 2011, 2014, 2020 kaliko - -# 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 . +# SPDX-FileCopyrightText: 2011, 2014, 2020 kaliko +# 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 = ['{1}'.format(html_escape(u), - html_escape(u[7:]) - ) for u in Feeds.FEEDS] + html = ['{1}'.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:
' + '
'.join(html)} self.reply(rcv, msg)