mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-27 05:09:23 +01:00
Merge branch 'relay-nick-hostmask'
This commit is contained in:
commit
05529e22a5
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user