Merge pull request CloudBotIRC#118 from linuxdaemon/tracker-fix

Fix core_tracker.py tracking of bot joins/parts

Author: edwardslabs

cloudbot/clients/irc.py

@@ -382,16 +382,21 @@ def data_received(self, data):
                 ctcp_text = None
 
             # Channel
-            # TODO: Migrate plugins using chan for storage to use chan.lower() instead so we can pass the original case
-            if command_params and (len(command_params) > 2 or not command_params[0].startswith(":")):
-
-                if command_params[0].lower() == self.conn.nick.lower():
-                    # this is a private message - set the channel to the sender's nick
+            channel = None
+            if command_params:
+                if command in ["NOTICE", "PRIVMSG", "KICK", "JOIN", "PART", "MODE"]:
+                    channel = command_params[0]
+                elif command == "INVITE":
+                    channel = command_params[1]
+                elif len(command_params) > 2 or command_params[0][0] != ':':
+                    channel = command_params[0]
+
+            if channel:
+                channel = channel.lower()
+                if channel[0] == ':':
+                    channel = channel[1:].split()[0]  # Just in case there is more data
+                if channel == self.conn.nick.lower():
                     channel = nick.lower()
-                else:
-                    channel = command_params[0].lower()
-            else:
-                channel = None
 
             # Set up parsed message
             # TODO: Do we really want to send the raw `prefix` and `command_params` here?
@@ -401,3 +406,12 @@ def data_received(self, data):
 
             # handle the message, async
             asyncio.async(self.bot.process(event), loop=self.loop)
+
+# Channel Commands
+# NOTICE #chan :Text
+# PRIVMSG #chan :Text
+# KICK #chan nick :reason
+# JOIN #chan
+# PART #chan :reason
+# MODE #chan +<modes>
+# INVITE nick :#chan

plugins/core_tracker.py

@@ -69,23 +69,23 @@ def on_nick(irc_paramlist, conn, irc_raw):
 # mostly when using a BNC which saves channels
 @asyncio.coroutine
 @hook.irc_raw("JOIN")
-def on_join(conn, chan, target):
+def on_join(conn, chan, nick):
     """
     :type conn: cloudbot.client.Client
     :type chan: str
     :type nick: str
     """
-    if target == conn.nick:
+    if nick == conn.nick:
         bot_joined_channel(conn, chan)
 
 
 @asyncio.coroutine
 @hook.irc_raw("PART")
-def on_join(conn, chan, target):
+def on_part(conn, chan, nick):
     """
     :type conn: cloudbot.client.Client
     :type chan: str
     :type nick: str
     """
-    if target == conn.nick:
-        bot_joined_channel(conn, chan)
+    if nick == conn.nick:
+        bot_left_channel(conn, chan)