From c62dd272d687438dd928768452deb7eab6672ce9 Mon Sep 17 00:00:00 2001 From: James Lu Date: Mon, 19 Sep 2016 17:40:50 -0700 Subject: [PATCH] relay_clientbot: display the remote channel in join/kick/etc relay, not the local channel --- plugins/relay_clientbot.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/relay_clientbot.py b/plugins/relay_clientbot.py index 749762d..4e0682c 100644 --- a/plugins/relay_clientbot.py +++ b/plugins/relay_clientbot.py @@ -148,6 +148,11 @@ def cb_relay_core(irc, source, command, args): args.update({'netname': netname, 'sender': sourcename, 'sender_identhost': identhost, 'colored_sender': color_text(sourcename), 'colored_netname': color_text(netname)}) + if 'channel' in args: + # Display the real channel instead of the local name, if applicable + args['local_channel'] = args['channel'] + args['channel'] = relay.getRemoteChan(irc, world.networkobjects[origuser[0]], args['channel']) + log.debug('(%s) relay_clientbot: coersing $channel from %s to %s', irc.name, args['local_channel'], args['channel']) for target in targets: cargs = args.copy() # Copy args list to manipulate them in a channel specific way