From 06539fc813b53e6b11fc95d198489a181dc91d44 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sun, 15 Nov 2015 21:42:58 -0800 Subject: [PATCH] unreal: add missing SJOIN->JOIN hook map, and set irc.connected (relay will otherwise break) --- plugins/relay.py | 1 + protocols/unreal.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/relay.py b/plugins/relay.py index c7b929e..f1d0c3e 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -170,6 +170,7 @@ def getRemoteSid(irc, remoteirc): it if it doesn't exist.""" # Don't spawn servers too early. irc.connected.wait(2) + try: spawnservers = irc.conf['relay']['spawn_servers'] except KeyError: diff --git a/protocols/unreal.py b/protocols/unreal.py index 16e4eef..eb9ad38 100644 --- a/protocols/unreal.py +++ b/protocols/unreal.py @@ -20,7 +20,7 @@ class UnrealProtocol(TS6BaseProtocol): self.proto_ver = 3999 self.min_proto_ver = 3999 self.hook_map = {'UMODE2': 'MODE', 'SVSKILL': 'KILL', 'SVSMODE': 'MODE', - 'SVS2MODE': 'MODE'} + 'SVS2MODE': 'MODE', 'SJOIN': 'JOIN'} self.uidgen = {} self.sidgen = utils.TS6SIDGenerator(self.irc) @@ -261,6 +261,7 @@ class UnrealProtocol(TS6BaseProtocol): f('SERVER %s 1 U%s-h6e-%s :%s' % (host, self.proto_ver, self.irc.sid, sdesc)) f('NETINFO 1 %s %s * 0 0 0 :%s' % (self.irc.start_ts, self.proto_ver, self.irc.serverdata.get("netname", self.irc.name))) self._send(self.irc.sid, 'EOS') + self.irc.connected.set() def handle_uid(self, numeric, command, args): # <- :001 UID GL 0 1441306929 gl localhost 0018S7901 0 +iowx * midnight-1C620195 fwAAAQ== :realname