transient timers shouldn't use the event system

1 files changed, 4 insertions, 6 deletions

diff --git a/modules/rss.py b/modules/rss.py
index 235d8bb3..e8e237da 100644
--- a/modules/rss.py
+++ b/modules/rss.py
@@ -14,8 +14,8 @@ RSS_INTERVAL = 60 # 1 minute
 class Module(ModuleManager.BaseModule):
     _name = "RSS"
     def on_load(self):
-        self.timers.add("rss", self.bot.get_setting("rss-interval",
-            RSS_INTERVAL))
+        self.timers.add("rss-feeds", self._timer,
+            self.bot.get_setting("rss-interval", RSS_INTERVAL))
 
     def _format_entry(self, server, feed_title, entry, shorten):
         title = entry["title"]
@@ -32,13 +32,11 @@ class Module(ModuleManager.BaseModule):
 
         return "%s%s%s%s" % (feed_title_str, title, author, link)
 
-
-    @utils.hook("timer.rss")
-    def timer(self, event):
+    def _timer(self, timer):
         start_time = time.monotonic()
         self.log.trace("Polling RSS feeds")
 
-        event["timer"].redo()
+        timer.redo()
         hook_settings = self.bot.database.channel_settings.find_by_setting(
             "rss-hooks")
         hooks = {}