From 0e0feb1a8489638c8fc7dfa9a189cba6111db471 Mon Sep 17 00:00:00 2001 From: James Lu Date: Wed, 4 Feb 2015 21:20:45 -0800 Subject: [PATCH] Owner: substitute %version% for the Supybot version in plugins.Owner.quitMsg (Closes ProgVal#847) Cherry-picked from commit GLolol@205199e. --- plugins/Owner/config.py | 4 ++-- plugins/Owner/plugin.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/Owner/config.py b/plugins/Owner/config.py index 25e5d9915..02852e5b4 100644 --- a/plugins/Owner/config.py +++ b/plugins/Owner/config.py @@ -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) diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index 8f5afc245..e3ed912ea 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -344,9 +344,11 @@ class Owner(callbacks.Plugin): Exits the bot with the QUIT message . If 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()