From f93349ae1f603379bafbfe3dff111c251bb37b86 Mon Sep 17 00:00:00 2001
From: James Lu <GLolol1@hotmail.com>
Date: Tue, 18 Aug 2015 02:59:31 -0700
Subject: [PATCH] relay: when restoring a user after KICK, join them to the
 *right* channel

---
 plugins/relay.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/relay.py b/plugins/relay.py
index bc89461..a76646e 100644
--- a/plugins/relay.py
+++ b/plugins/relay.py
@@ -396,7 +396,7 @@ def handle_kick(irc, source, command, args):
                 # kick ops, admins can't kick owners, etc.
                 modes = getPrefixModes(remoteirc, irc, remotechan, real_target)
                 # Join the kicked client back with its respective modes.
-                irc.proto.sjoinServer(irc, irc.sid, remotechan, [(modes, target)])
+                irc.proto.sjoinServer(irc, irc.sid, channel, [(modes, target)])
                 if kicker in irc.users:
                     utils.msg(irc, kicker, "This channel is claimed; your kick to "
                                            "%s has been blocked because you are not "