From f78803a82bc91cca0f3b3ae2437b21a4a6fa5d0b Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 Jun 2011 15:23:17 +0200 Subject: [PATCH] Relay: remove redundant nick on join/part when hostmasks enabled Signed-off-by: James McCoy (cherry picked from commit ce4d26514b96bf78c7496b28500816913058c3b0) Signed-off-by: Daniel Folkinshteyn --- plugins/Relay/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Relay/plugin.py b/plugins/Relay/plugin.py index ffd31f80f..203159aa3 100644 --- a/plugins/Relay/plugin.py +++ b/plugins/Relay/plugin.py @@ -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: