Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-11 03:50:44 +01:00
Code Issues Projects Releases Wiki Activity

RSS: Fix error when re-creating a feed with a different name

Browse Source 
Closes GH-1547
This commit is contained in:
Valentin Lorentz 2024-05-12 16:34:36 +02:00
parent b1ba8ecb2a
commit 4898926f20
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/RSS/plugin.py
View File

@ -280,7 +280,7 @@ class RSS(callbacks.Plugin):
raise callbacks.Error(s) raise callbacks.Error(s)
if url: if url:
feed = self.feeds.get(url) feed = self.feeds.get(url)
if feed and feed.name != feed.url: if feed and feed.name != feed.url and feed.name in self.feed_names:
s = format(_('I already have a feed with that URL named %s.'), s = format(_('I already have a feed with that URL named %s.'),
feed.name) feed.name)
raise callbacks.Error(s) raise callbacks.Error(s)

21
plugins/RSS/test.py
View File

@ -121,6 +121,27 @@ class RSSTestCase(ChannelPluginTestCase):
self.assertEqual(self.irc.getCallback('RSS').feed_names, {}) self.assertEqual(self.irc.getCallback('RSS').feed_names, {})
self.assertTrue(self.irc.getCallback('RSS').get_feed('http://xkcd.com/rss.xml')) self.assertTrue(self.irc.getCallback('RSS').get_feed('http://xkcd.com/rss.xml'))
@mock_urllib
def testChangeUrl(self, mock):
try:
self.assertNotError('rss add xkcd http://xkcd.com/rss.xml')
self.assertNotError('rss remove xkcd')
self.assertNotError('rss add xkcd https://xkcd.com/rss.xml')
self.assertRegexp('help xkcd', 'https://')
finally:
self._feedMsg('rss remove xkcd')
@mock_urllib
def testChangeName(self, mock):
try:
self.assertNotError('rss add xkcd http://xkcd.com/rss.xml')
self.assertNotError('rss remove xkcd')
self.assertNotError('rss add xkcd2 http://xkcd.com/rss.xml')
self.assertRegexp('help xkcd2', 'http://xkcd.com')
finally:
self._feedMsg('rss remove xkcd')
self._feedMsg('rss remove xkcd2')
@mock_urllib @mock_urllib
def testInitialAnnounceNewest(self, mock): def testInitialAnnounceNewest(self, mock):
mock._data = xkcd_new mock._data = xkcd_new