Merge branch 'owner/quitmsg-version' into admin/configurable-partmsg

This commit is contained in:
James Lu 2015-02-05 20:13:30 -08:00
commit a46f12beeb
2 changed files with 5 additions and 3 deletions

View File

@ -46,10 +46,10 @@ conf.registerGlobalValue(Owner, 'public',
registry.Boolean(True, """Determines whether this plugin is publicly
visible."""))
conf.registerGlobalValue(Owner, 'quitMsg',
registry.String('', """Determines what quit message will be used by default.
registry.String('%version%', """Determines what quit message will be used by default.
If the quit command is called without a quit message, this will be used. If
this value is empty, the nick of the person giving the quit command will be
used."""))
used. %version% is automatically expanded to the bot's current version."""))
conf.registerGroup(conf.supybot.commands, 'renames', orderAlphabetically=True)

View File

@ -344,9 +344,11 @@ class Owner(callbacks.Plugin):
Exits the bot with the QUIT message <text>. If <text> is not given,
the default quit message (supybot.plugins.Owner.quitMsg) will be used.
If there is no default quitMsg set, your nick will be used.
If there is no default quitMsg set, your nick will be used. %version%
is automatically expanded to the bot's current version.
"""
text = text or self.registryValue('quitMsg') or msg.nick
text = text.replace("%version%", "Supybot %s" % conf.version)
irc.noReply()
m = ircmsgs.quit(text)
world.upkeep()