Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'relay-nick-hostmask' into maint/0.83.4

This commit is contained in:
James McCoy 2011-10-22 16:10:43 -04:00
parent 58eee3c995 ce4d26514b
commit fb8f0741e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Relay/plugin.py
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: