Give SentLine (and preproc.send events) a new event object, to track events

related to a line after it is sent

2 files changed, 5 insertions, 5 deletions

diff --git a/modules/admin.py b/modules/admin.py
index 765758ca..3128afb8 100644
--- a/modules/admin.py
+++ b/modules/admin.py
@@ -45,7 +45,7 @@ class Module(ModuleManager.BaseModule):
         :permission: reconnect
         """
         line = event["server"].send_quit("Reconnecting")
-        line.on_send(lambda: self.bot.reconnect(
+        line.events.on("send").hook(lambda e: self.bot.reconnect(
             event["server"].id, event["server"].connection_params))
 
     @utils.hook("received.command.connect", min_args=1)
@@ -97,9 +97,9 @@ class Module(ModuleManager.BaseModule):
         reason = event["args"] or ""
         for server in self.bot.servers.values():
             line = server.send_quit(reason)
-            line.on_send(self._shutdown_hook(server))
+            line.events.on("send").hook(self._shutdown_hook(server))
     def _shutdown_hook(self, server):
-        def shutdown():
+        def shutdown(e):
             server.disconnect()
             self.bot.disconnect(server)
         return shutdown
diff --git a/modules/signals.py b/modules/signals.py
index 8e31d03e..0be15692 100644
--- a/modules/signals.py
+++ b/modules/signals.py
@@ -26,7 +26,7 @@ class Module(ModuleManager.BaseModule):
 
                 line = utils.irc.protocol.quit("Shutting down")
                 sent_line = server.send(line, immediate=True)
-                sent_line.on_send(self._make_hook(server))
+                sent_line.events.on("send").hook(self._make_hook(server))
 
                 server.send_enabled = False
                 written = True
@@ -35,7 +35,7 @@ class Module(ModuleManager.BaseModule):
             sys.exit()
 
     def _make_hook(self, server):
-        return lambda: self.bot.disconnect(server)
+        return lambda e: self.bot.disconnect(server)
 
     def SIGUSR1(self, signum, frame):
         self.bot.trigger(self._reload_config)