From 58befaee5cb3f8fd79edf689da9c2cdeeb7024af Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 21 May 2013 18:52:46 +0200 Subject: [PATCH] Admin: @nick only sets the nick on the current network. Closes GH-273. --- plugins/Admin/plugin.py | 10 ++++++---- plugins/Admin/test.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/Admin/plugin.py b/plugins/Admin/plugin.py index 64afafb37..56049eefa 100644 --- a/plugins/Admin/plugin.py +++ b/plugins/Admin/plugin.py @@ -212,19 +212,21 @@ class Admin(callbacks.Plugin): self.log.debug('Got NICK without Admin.nick being called.') @internationalizeDocstring - def nick(self, irc, msg, args, nick): - """[] + def nick(self, irc, msg, args, nick, network): + """[] [] Changes the bot's nick to . If no nick is given, returns the bot's current nick. """ + network = network or irc.network if nick: - conf.supybot.nick.setValue(nick) + group = getattr(conf.supybot.networks, network) + group.nick.setValue(nick) irc.queueMsg(ircmsgs.nick(nick)) self.pendingNickChanges[irc.getRealIrc()] = irc else: irc.reply(irc.nick) - nick = wrap(nick, [additional('nick')]) + nick = wrap(nick, [additional('nick'), additional('something')]) @internationalizeDocstring def part(self, irc, msg, args, channel, reason): diff --git a/plugins/Admin/test.py b/plugins/Admin/test.py index 7260c5d1d..5f94faf6f 100644 --- a/plugins/Admin/test.py +++ b/plugins/Admin/test.py @@ -122,7 +122,7 @@ class AdminTestCase(PluginTestCase): self.assertEqual(m.command, 'NICK') self.assertEqual(m.args[0], 'foobar') finally: - conf.supybot.nick.setValue(original) + conf.supybot.networks.test.nick.setValue('') def testAddCapabilityOwner(self): self.assertError('admin capability add %s owner' % self.nick)