Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-04 18:38:39 +02:00
Code Issues Projects Releases Wiki Activity

Admin: @nick only sets the nick on the current network. Closes GH-273.

Browse Source
This commit is contained in:
Valentin Lorentz 2013-05-21 18:52:46 +02:00
parent a15dea55db
commit 58befaee5c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Admin/plugin.py
View File

@ -212,19 +212,21 @@ class Admin(callbacks.Plugin):
self.log.debug('Got NICK without Admin.nick being called.') self.log.debug('Got NICK without Admin.nick being called.')
@internationalizeDocstring @internationalizeDocstring
def nick(self, irc, msg, args, nick): def nick(self, irc, msg, args, nick, network):
"""[<nick>] """[<nick>] [<network>]
Changes the bot's nick to <nick>. If no nick is given, returns the Changes the bot's nick to <nick>. If no nick is given, returns the
bot's current nick. bot's current nick.
""" """
network = network or irc.network
if nick: if nick:
conf.supybot.nick.setValue(nick) group = getattr(conf.supybot.networks, network)
group.nick.setValue(nick)
irc.queueMsg(ircmsgs.nick(nick)) irc.queueMsg(ircmsgs.nick(nick))
self.pendingNickChanges[irc.getRealIrc()] = irc self.pendingNickChanges[irc.getRealIrc()] = irc
else: else:
irc.reply(irc.nick) irc.reply(irc.nick)
nick = wrap(nick, [additional('nick')]) nick = wrap(nick, [additional('nick'), additional('something')])
@internationalizeDocstring @internationalizeDocstring
def part(self, irc, msg, args, channel, reason): def part(self, irc, msg, args, channel, reason):

2
plugins/Admin/test.py
View File

@ -122,7 +122,7 @@ class AdminTestCase(PluginTestCase):
self.assertEqual(m.command, 'NICK') self.assertEqual(m.command, 'NICK')
self.assertEqual(m.args[0], 'foobar') self.assertEqual(m.args[0], 'foobar')
finally: finally:
conf.supybot.nick.setValue(original) conf.supybot.networks.test.nick.setValue('')
def testAddCapabilityOwner(self): def testAddCapabilityOwner(self):
self.assertError('admin capability add %s owner' % self.nick) self.assertError('admin capability add %s owner' % self.nick)