From dccf91c855b615ccb77c787cd9ab5b25040f44d0 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Tue, 24 Aug 2004 04:47:34 +0000
Subject: [PATCH] Fix for RFE #1012383, RSS shouldn't announce announced feeds
 right after startup.

---
 plugins/RSS.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/RSS.py b/plugins/RSS.py
index b2f97fad5..4d8fe9ac6 100644
--- a/plugins/RSS.py
+++ b/plugins/RSS.py
@@ -101,6 +101,7 @@ class RSS(callbacks.Privmsg):
             self._registerFeed(name)
             url = self.registryValue('feeds.%s' % name)
             self.makeFeedCommand(name, url)
+            self.getFeed(url) # So announced feeds don't announce on startup.
 
     def _registerFeed(self, name, url=''):
         self.registryValue('feeds').add(name)
@@ -110,10 +111,9 @@ class RSS(callbacks.Privmsg):
     def __call__(self, irc, msg):
         callbacks.Privmsg.__call__(self, irc, msg)
         irc = callbacks.SimpleProxy(irc, msg)
-        L = conf.supybot.plugins.RSS.announce.getValues(fullNames=False)
         newFeeds = {}
-        for (channel, v) in L:
-            feeds = v()
+        for channel in irc.state.channels:
+            feeds = self.registryValue('announce', channel)
             for name in feeds:
                 commandName = callbacks.canonicalName(name)
                 if self.isCommand(commandName):