Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-24 11:42:52 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James McCoy 2011-10-22 16:10:43 -04:00
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 return
network = self._getIrcName(irc) network = self._getIrcName(irc)
if self.registryValue('hostmasks', channel): if self.registryValue('hostmasks', channel):
hostmask = format(' (%s)', msg.prefix) hostmask = format(' (%s)', msg.prefix.split('!')[1])
else: else:
hostmask = '' hostmask = ''
s = format('%s%s has joined on %s', msg.nick, hostmask, network) s = format('%s%s has joined on %s', msg.nick, hostmask, network)
@ -398,7 +398,7 @@ class Relay(callbacks.Plugin):
return return
network = self._getIrcName(irc) network = self._getIrcName(irc)
if self.registryValue('hostmasks', channel): if self.registryValue('hostmasks', channel):
hostmask = format(' (%s)', msg.prefix) hostmask = format(' (%s)', msg.prefix.split('!')[1])
else: else:
hostmask = '' hostmask = ''
if len(msg.args) > 1: if len(msg.args) > 1: