From f2a21148e7bb9ddd4f17767aaffe6fc408e66942 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 25 Mar 2016 17:14:16 -0700 Subject: [PATCH 1/2] Irc: run initVars() on connect too 2b16f25b612e2d3a0ba145cf314e5167b24c0767 is wrong; it caused reconnects to fail with disconnect loops. (cherry picked from commit 45c2abdae79ad14342a4cfb615c7b658d0aaa9ac) --- classes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/classes.py b/classes.py index c4f209a..f623223 100644 --- a/classes.py +++ b/classes.py @@ -165,6 +165,7 @@ class Irc(): __init__ in a separate thread to allow multiple concurrent connections. """ while True: + self.initVars() ip = self.serverdata["ip"] port = self.serverdata["port"] checks_ok = True From 9cd1635f68dafee47f147de43b258014d14da6e2 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sat, 26 Mar 2016 12:50:23 -0700 Subject: [PATCH 2/2] unreal: fix wrong variable name in handle_umode2 --- protocols/unreal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocols/unreal.py b/protocols/unreal.py index 82e035b..0f6dda6 100644 --- a/protocols/unreal.py +++ b/protocols/unreal.py @@ -673,7 +673,7 @@ class UnrealProtocol(TS6BaseProtocol): if ('+o', None) in parsedmodes: # If +o being set, call the CLIENT_OPERED internal hook. - self.irc.callHooks([uid, 'CLIENT_OPERED', {'text': 'IRC_Operator'}]) + self.irc.callHooks([numeric, 'CLIENT_OPERED', {'text': 'IRC_Operator'}]) self.checkCloakChange(numeric, parsedmodes)