Fix for bug #825749, improper relaying of relay of kicks.

This commit is contained in:
Jeremy Fincher 2003-10-17 23:08:27 +00:00
parent 9966fc72a9
commit fa8fc4ab52

View File

@ -516,11 +516,11 @@ class Relay(callbacks.Privmsg):
return return
abbrev = self.abbreviations[irc] abbrev = self.abbreviations[irc]
if len(msg.args) == 3: if len(msg.args) == 3:
s = '%s@%s was kicked by %s@%s (%s)' % \ s = '%s was kicked by %s on %s (%s)' % \
(msg.args[1], abbrev, msg.nick, abbrev, msg.args[2]) (msg.args[1], msg.nick, abbrev, msg.args[2])
else: else:
s = '%s@%s was kicked by %s@%s' % \ s = '%s was kicked by %s on %s' % \
(msg.args[1], abbrev, msg.nick, abbrev) (msg.args[1], msg.nick, abbrev)
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
@ -577,6 +577,7 @@ class Relay(callbacks.Privmsg):
'has left on ' in text or \ 'has left on ' in text or \
'has joined on ' in text or \ 'has joined on ' in text or \
'has quit' in text or \ 'has quit' in text or \
'was kicked by' in text \
text.startswith('mode change') or \ text.startswith('mode change') or \
text.startswith('nick change') or \ text.startswith('nick change') or \
text.startswith('topic change')): text.startswith('topic change')):