mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-30 06:49:24 +01:00
Network: Perform susbstitution in quit message.
This commit is contained in:
parent
b69e6e22bb
commit
ad8883a724
@ -112,7 +112,10 @@ class Network(callbacks.Plugin):
|
|||||||
message. <network> is only necessary if the network is different
|
message. <network> is only necessary if the network is different
|
||||||
from the network the command is sent on.
|
from the network the command is sent on.
|
||||||
"""
|
"""
|
||||||
quitMsg = quitMsg or conf.supybot.plugins.Owner.quitMsg() or msg.nick
|
standard_msg = conf.supybot.plugins.Owner.quitMsg()
|
||||||
|
if standard_msg:
|
||||||
|
standard_msg = ircutils.standardSubstitute(irc, msg, standard_msg)
|
||||||
|
quitMsg = quitMsg or standard_msg or msg.nick
|
||||||
otherIrc.queueMsg(ircmsgs.quit(quitMsg))
|
otherIrc.queueMsg(ircmsgs.quit(quitMsg))
|
||||||
otherIrc.die()
|
otherIrc.die()
|
||||||
conf.supybot.networks().discard(otherIrc.network)
|
conf.supybot.networks().discard(otherIrc.network)
|
||||||
@ -131,7 +134,10 @@ class Network(callbacks.Plugin):
|
|||||||
(supybot.plugins.Owner.quitMsg) or the nick of the person giving the
|
(supybot.plugins.Owner.quitMsg) or the nick of the person giving the
|
||||||
command.
|
command.
|
||||||
"""
|
"""
|
||||||
quitMsg = quitMsg or conf.supybot.plugins.Owner.quitMsg() or msg.nick
|
standard_msg = conf.supybot.plugins.Owner.quitMsg()
|
||||||
|
if standard_msg:
|
||||||
|
standard_msg = ircutils.standardSubstitute(irc, msg, standard_msg)
|
||||||
|
quitMsg = quitMsg or standard_msg or msg.nick
|
||||||
otherIrc.queueMsg(ircmsgs.quit(quitMsg))
|
otherIrc.queueMsg(ircmsgs.quit(quitMsg))
|
||||||
if otherIrc != irc:
|
if otherIrc != irc:
|
||||||
# No need to reply if we're reconnecting ourselves.
|
# No need to reply if we're reconnecting ourselves.
|
||||||
|
Loading…
Reference in New Issue
Block a user