Fix JOIN syntax for irc daemons that take channel name as the first param

Author: Xe

modules/protocol/elemental-ircd.py

@@ -35,6 +35,7 @@
 def initModule(cod):
     cod.loginFunc = login
     cod.burstClient = burstClient
+    cod.tsSecond = False
 
     cod.s2scommands["EUID"] = [handleEUID]
     cod.s2scommands["QUIT"] = [handleQUIT]

modules/protocol/inspircd.py

@@ -32,8 +32,8 @@
 
 def initModule(cod):
     cod.loginFunc = login
-    cod.join = join
     cod.burstClient = burstClient
+    cod.tsSecond = True
 
     cod.s2scommands["UID"] = [handleUID]
     cod.s2scommands["QUIT"] = [handleQUIT]
@@ -120,8 +120,8 @@ def handleENDBURST(cod, line):
     cod.loadmod("admin")
     cod.loadmod("help")
 
-    cod.join(cod, cod.config["etc"]["staffchan"])
-    cod.join(cod, cod.config["etc"]["snoopchan"])
+    cod.join(cod.config["etc"]["staffchan"])
+    cod.join(cod.config["etc"]["snoopchan"])
 
     cod.privmsg("NickServ", "IDENTIFY %s" % cod.config["me"]["servicespass"])
 

src/cod.py

@@ -364,7 +364,10 @@ def join(self, channel, client=None):
 
         channel = self.channels[channel]
 
-        self.sendLine(client.join(channel))
+        if self.tsSecond:
+            self.sendLine(":%s JOIN %s %s" % (client.uid, channel.name, channel.ts))
+        else:
+            self.sendLine(client.join(channel))
 
         client.channels.append(channel.name)