Fix more instances of event["args"] (now event["line"].args)

4 files changed, 9 insertions, 8 deletions

diff --git a/modules/ircv3_resume.py b/modules/ircv3_resume.py
index 1d8e678c..6c368316 100644
--- a/modules/ircv3_resume.py
+++ b/modules/ircv3_resume.py
@@ -35,14 +35,14 @@ class Module(ModuleManager.BaseModule):
     def on_resume(self, event):
         cap_done = True
 
-        if event["args"][0] == "SUCCESS":
+        if event["line"].args[0] == "SUCCESS":
             resume_channels = event["server"].get_setting("resume-channels", [])
             self.log.info("Successfully resumed session")
             event["server"].clear_waiting_capabilities()
 
-        elif event["args"][0] == "TOKEN":
+        elif event["line"].args[0] == "TOKEN":
             token = self._get_token(event["server"])
-            self._set_token(event["server"], event["args"][1], new=True)
+            self._set_token(event["server"], event["line"].args[1], new=True)
 
             if token:
                 timestamp = event["server"]._resume_timestamp
diff --git a/modules/ircv3_sasl/__init__.py b/modules/ircv3_sasl/__init__.py
index 74486bd2..c86796b0 100644
--- a/modules/ircv3_sasl/__init__.py
+++ b/modules/ircv3_sasl/__init__.py
@@ -130,7 +130,7 @@ class Module(ModuleManager.BaseModule):
 
     @utils.hook("received.908")
     def sasl_mechanisms(self, event):
-        server_mechanisms = event["args"][1].split(",")
+        server_mechanisms = event["line"].args[1].split(",")
         mechanism = self._best_userpass_mechanism(server_mechanimsms)
         event["server"].sasl_mechanism = mechanism
         event["server"].send_authenticate(mechanism)
@@ -140,7 +140,8 @@ class Module(ModuleManager.BaseModule):
         self._end_sasl(event["server"])
     @utils.hook("received.904")
     def sasl_failure(self, event):
-        self._panic(event["server"], "ERR_SASLFAIL (%s)" % event["args"][1])
+        self._panic(event["server"], "ERR_SASLFAIL (%s)" %
+            event["line"].args[1])
 
     @utils.hook("received.907")
     def sasl_already(self, event):
diff --git a/modules/line_handler/channel.py b/modules/line_handler/channel.py
index 15720ac7..7dfea4ca 100644
--- a/modules/line_handler/channel.py
+++ b/modules/line_handler/channel.py
@@ -157,7 +157,7 @@ def kick(events, event):
 
 def rename(events, event):
     old_name = event["line"].args[0]
-    new_name = event["args"].args[1]
+    new_name = event["line"].args[1]
     channel = event["server"].channels.get(old_name)
 
     event["server"].channels.rename(old_name, new_name)
diff --git a/modules/nick_regain.py b/modules/nick_regain.py
index 4fbc1cfa..20602dbb 100644
--- a/modules/nick_regain.py
+++ b/modules/nick_regain.py
@@ -26,7 +26,7 @@ class Module(ModuleManager.BaseModule):
     @utils.hook("received.731")
     def mon_offline(self, event):
         target_nick = event["server"].connection_params.nickname
-        nicks = event["args"][1].split(",")
+        nicks = event["line"].args[1].split(",")
         nicks = [event["server"].irc_lower(n) for n in nicks]
         if event["server"].irc_lower(target_nick) in nicks:
             event["server"].send_nick(target_nick)
@@ -42,7 +42,7 @@ class Module(ModuleManager.BaseModule):
     @utils.hook("received.303")
     def ison_response(self, event):
         target_nick = event["server"].connection_params.nickname
-        if not event["args"][1] and not event["server"].irc_equals(
+        if not event["line"].args[1] and not event["server"].irc_equals(
                 event["server"].nickname, target_nick):
             event["server"].send_nick(target_nick)