Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-23 17:10:47 +01:00
Code Issues Projects Releases Wiki Activity

RSS: Show a meaningful error in case '@rss' is called with a non-URL/name.

Browse Source 
Instead of letting feedparser try to parse the name.
This commit is contained in:
Valentin Lorentz 2020-01-28 19:34:35 +01:00
parent d3b991895c
commit 653afdd086
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/RSS/plugin.py
View File

@ -99,9 +99,9 @@ class Feed:
plugin_is_loading=False, announced=None):
assert name, name
if not url:
if not utils.web.httpUrlRe.match(name):
raise InvalidFeedUrl(name)
url = name
if not utils.web.httpUrlRe.match(url):
raise InvalidFeedUrl(url)
self.name = name
self.url = url
self.initial = initial
@ -560,9 +560,12 @@ class RSS(callbacks.Plugin):
If <number of headlines> is given, return only that many headlines.
"""
self.log.debug('Fetching %u', url)
feed = self.get_feed(url)
if not feed:
feed = Feed(url, url, True)
try:
feed = self.get_feed(url)
if not feed:
feed = Feed(url, url, True)
except InvalidFeedUrl:
irc.error('%s is not a valid feed URL or name.' % url, Raise=True)
channel = msg.channel
self.update_feed_if_needed(feed)
entries = feed.entries