Relay: remove redundant nick on join/part when hostmasks enabled

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit ce4d26514b)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
This commit is contained in:
Valentin Lorentz 2011-06-30 15:23:17 +02:00 committed by Daniel Folkinshteyn
parent a93d3fee85
commit f78803a82b

View File

@ -384,7 +384,7 @@ class Relay(callbacks.Plugin):
return
network = self._getIrcName(irc)
if self.registryValue('hostmasks', channel):
hostmask = format(' (%s)', msg.prefix)
hostmask = format(' (%s)', msg.prefix.split('!')[1])
else:
hostmask = ''
s = format('%s%s has joined on %s', msg.nick, hostmask, network)
@ -398,7 +398,7 @@ class Relay(callbacks.Plugin):
return
network = self._getIrcName(irc)
if self.registryValue('hostmasks', channel):
hostmask = format(' (%s)', msg.prefix)
hostmask = format(' (%s)', msg.prefix.split('!')[1])
else:
hostmask = ''
if len(msg.args) > 1: