GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00
Code Issues Projects Releases Wiki Activity

relay: don't prepend sender prefixes more than once (for servers and clients not on any relay networks)

Browse Source
This commit is contained in:
James Lu 2015-09-20 18:13:39 -07:00
parent f2b6d1a3ad
commit 7e12ec9e5e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/relay.py
View File

@ -775,8 +775,7 @@ def handle_kick(irc, source, command, args):
# Propogate the kick! # Propogate the kick!
if real_kicker: if real_kicker:
log.debug('(%s) Relay kick: Kicking %s from channel %s via %s on behalf of %s/%s', irc.name, real_target, remotechan,real_kicker, kicker, irc.name) log.debug('(%s) Relay kick: Kicking %s from channel %s via %s on behalf of %s/%s', irc.name, real_target, remotechan,real_kicker, kicker, irc.name)
remoteirc.proto.kickClient(real_kicker, remoteirc.proto.kickClient(real_kicker, remotechan, real_target, args['text'])
remotechan, real_target, text)
else: else:
# Kick originated from a server, or the kicker isn't in any # Kick originated from a server, or the kicker isn't in any
# common channels with the target relay network. # common channels with the target relay network.
@ -787,9 +786,9 @@ def handle_kick(irc, source, command, args):
kname = irc.servers[kicker].name kname = irc.servers[kicker].name
else: else:
kname = irc.users.get(kicker).nick kname = irc.users.get(kicker).nick
text = "(%s/%s) %s" % (kname, irc.name, text) text = "(%s/%s) %s" % (kname, irc.name, args['text'])
except AttributeError: except AttributeError:
text = "(<unknown kicker>@%s) %s" % (irc.name, text) text = "(<unknown kicker>@%s) %s" % (irc.name, args['text'])
remoteirc.proto.kickServer(rsid, remotechan, real_target, text) remoteirc.proto.kickServer(rsid, remotechan, real_target, text)
# If the target isn't on any channels, quit them. # If the target isn't on any channels, quit them.