From 8fb97c56bc4017c16689d74c113a6bac843fc590 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 29 Jun 2011 13:56:22 +0200 Subject: [PATCH 01/11] Owner: Fix bug with @enable and @disable if a plugin is given. Closes GH-43. Closes GH-44. Signed-off-by: James McCoy --- plugins/Owner/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index e0d6f5332..90dacad8b 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -537,11 +537,11 @@ class Owner(callbacks.Plugin): if plugin.isCommand(command): pluginCommand = '%s.%s' % (plugin.name(), command) conf.supybot.commands.disabled().add(pluginCommand) + plugin._disabled.add(command) else: irc.error('%s is not a command in the %s plugin.' % (command, plugin.name())) return - self._disabled.add(pluginCommand, plugin.name()) else: conf.supybot.commands.disabled().add(command) self._disabled.add(command) @@ -557,8 +557,8 @@ class Owner(callbacks.Plugin): """ try: if plugin: + plugin._disabled.remove(command, plugin.name()) command = '%s.%s' % (plugin.name(), command) - self._disabled.remove(command, plugin.name()) else: self._disabled.remove(command) conf.supybot.commands.disabled().remove(command) From 5dcbe57fa3acea5db2d40343ca3f9b8116e6e827 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 Jun 2011 19:06:22 +0200 Subject: [PATCH 02/11] AutoMode: fix bans. Signed-off-by: James McCoy --- plugins/AutoMode/plugin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/AutoMode/plugin.py b/plugins/AutoMode/plugin.py index 8c7fd1a69..8100f80a9 100644 --- a/plugins/AutoMode/plugin.py +++ b/plugins/AutoMode/plugin.py @@ -30,6 +30,7 @@ import time +import supybot.conf as conf import supybot.ircdb as ircdb import supybot.ircmsgs as ircmsgs import supybot.ircutils as ircutils From ce4d26514b96bf78c7496b28500816913058c3b0 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 Jun 2011 15:23:17 +0200 Subject: [PATCH 03/11] Relay: remove redundant nick on join/part when hostmasks enabled Signed-off-by: James McCoy --- plugins/Relay/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Relay/plugin.py b/plugins/Relay/plugin.py index ffd31f80f..203159aa3 100644 --- a/plugins/Relay/plugin.py +++ b/plugins/Relay/plugin.py @@ -384,7 +384,7 @@ class Relay(callbacks.Plugin): return network = self._getIrcName(irc) if self.registryValue('hostmasks', channel): - hostmask = format(' (%s)', msg.prefix) + hostmask = format(' (%s)', msg.prefix.split('!')[1]) else: hostmask = '' s = format('%s%s has joined on %s', msg.nick, hostmask, network) @@ -398,7 +398,7 @@ class Relay(callbacks.Plugin): return network = self._getIrcName(irc) if self.registryValue('hostmasks', channel): - hostmask = format(' (%s)', msg.prefix) + hostmask = format(' (%s)', msg.prefix.split('!')[1]) else: hostmask = '' if len(msg.args) > 1: From 70a6e6932d2b27dc516aa031fded1afe3359a850 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Fri, 15 Jul 2011 23:04:49 +0200 Subject: [PATCH 04/11] Protector: Fix variable name. Signed-off-by: James McCoy --- plugins/Protector/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Protector/plugin.py b/plugins/Protector/plugin.py index cae90feeb..0867e48eb 100644 --- a/plugins/Protector/plugin.py +++ b/plugins/Protector/plugin.py @@ -96,7 +96,7 @@ class Protector(callbacks.Plugin): channel = msg.args[0] chanOp = ircdb.makeChannelCapability(channel, 'op') chanVoice = ircdb.makeChannelCapability(channel, 'voice') - chanhalfop = ircdb.makeChannelCapability(channel, 'halfop') + chanHalfOp = ircdb.makeChannelCapability(channel, 'halfop') if not ircdb.checkCapability(msg.prefix, chanOp): irc.sendMsg(ircmsgs.deop(channel, msg.nick)) for (mode, value) in ircutils.separateModes(msg.args[1:]): From fa8385596dc99a483da4b98946253c8282a5baa6 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Thu, 30 Jun 2011 19:28:20 +0200 Subject: [PATCH 05/11] Karma: fix typo. Closes GH-38. Conflicts: plugins/Karma/locale/fi.po plugins/Karma/locale/fr.po plugins/Karma/messages.pot Signed-off-by: James McCoy --- plugins/Karma/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Karma/plugin.py b/plugins/Karma/plugin.py index 02570b5af..392590f78 100644 --- a/plugins/Karma/plugin.py +++ b/plugins/Karma/plugin.py @@ -280,7 +280,7 @@ class Karma(callbacks.Plugin): N karmas, where N is determined by the config variable supybot.plugins.Karma.rankingDisplay. If one is given, returns the details of its karma; if more than one is given, returns - the total karma of each of the the things. is only necessary + the total karma of each of the things. is only necessary if the message isn't sent on the channel itself. """ if len(things) == 1: From 8056da06f64796a981defffe7b6e0bac462f0175 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 9 Jul 2011 14:05:28 +0200 Subject: [PATCH 06/11] Channel: fix NameError: 'replyirc' -> 'replyIrc'. Closes GH-73. Conflicts: src/version.py Signed-off-by: James McCoy --- plugins/Channel/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Channel/plugin.py b/plugins/Channel/plugin.py index 7cb51f937..e4f16f945 100644 --- a/plugins/Channel/plugin.py +++ b/plugins/Channel/plugin.py @@ -418,7 +418,7 @@ class Channel(callbacks.Plugin): nick = msg.args[1] nick = ircutils.toLower(nick) replyIrc = self.invites.pop((irc, nick), None) - if replyirc is not None: + if replyIrc is not None: replyIrc.error(format('There is no %s on this server.', nick)) class lobotomy(callbacks.Commands): From 8fb4cbcdc61c2108309afd46e5a3a516fe676fb1 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 18 Jul 2011 15:23:06 +0200 Subject: [PATCH 07/11] Factoids: Fix typo. Conflicts: plugins/Factoids/locale/fi.po plugins/Factoids/locale/fr.po plugins/Factoids/messages.pot src/version.py Signed-off-by: James McCoy --- plugins/Factoids/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Factoids/plugin.py b/plugins/Factoids/plugin.py index 30d366fce..f534eeb42 100644 --- a/plugins/Factoids/plugin.py +++ b/plugins/Factoids/plugin.py @@ -382,7 +382,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler): """[] [--values] [--{regexp} ] [ ...] Searches the keyspace for keys matching . If --regexp is given, - it associated value is taken as a regexp and matched against the keys. + its associated value is taken as a regexp and matched against the keys. If --values is given, search the value space instead of the keyspace. """ if not optlist and not globs: From 9561c9f41744d70677bf7d8e15a73c9e30ac2502 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 30 Oct 2010 12:24:02 +0200 Subject: [PATCH 08/11] Topic: Fix bad doctring Conflicts: plugins/Topic/messages.pot Signed-off-by: James McCoy --- plugins/Topic/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Topic/plugin.py b/plugins/Topic/plugin.py index ac9fef272..8cb3387ed 100644 --- a/plugins/Topic/plugin.py +++ b/plugins/Topic/plugin.py @@ -351,7 +351,7 @@ class Topic(callbacks.Plugin): def unlock(self, irc, msg, args, channel): """[] - Locks the topic (sets the mode +t) in . is only + Unlocks the topic (sets the mode +t) in . is only necessary if the message isn't sent in the channel itself. """ irc.queueMsg(ircmsgs.mode(channel, '-t')) From f1690e68677b1c433e25b2c8766338bf995bceee Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 20 Jul 2011 21:28:43 +0200 Subject: [PATCH 09/11] Topic: fix typo in @unlock help. Conflicts: plugins/Topic/locale/fr.po plugins/Topic/messages.pot src/version.py Signed-off-by: James McCoy --- plugins/Topic/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Topic/plugin.py b/plugins/Topic/plugin.py index 8cb3387ed..d3dde3a6b 100644 --- a/plugins/Topic/plugin.py +++ b/plugins/Topic/plugin.py @@ -351,7 +351,7 @@ class Topic(callbacks.Plugin): def unlock(self, irc, msg, args, channel): """[] - Unlocks the topic (sets the mode +t) in . is only + Unlocks the topic (sets the mode -t) in . is only necessary if the message isn't sent in the channel itself. """ irc.queueMsg(ircmsgs.mode(channel, '-t')) From a1a90f76735295a02c5a1450fcbcc571fcb18c24 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 7 Aug 2011 12:02:06 +0200 Subject: [PATCH 10/11] NickCapture: Fix plugin help and l10n-fr. Closes GH-116. Conflicts: plugins/NickCapture/locale/fr.po plugins/NickCapture/messages.pot src/version.py Signed-off-by: James McCoy --- plugins/NickCapture/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/NickCapture/plugin.py b/plugins/NickCapture/plugin.py index e81ad5718..56db6347c 100644 --- a/plugins/NickCapture/plugin.py +++ b/plugins/NickCapture/plugin.py @@ -35,7 +35,7 @@ import supybot.ircutils as ircutils import supybot.callbacks as callbacks class NickCapture(callbacks.Plugin): - """This module constantly tries to take whatever nick is configured as + """This plugin constantly tries to take whatever nick is configured as supybot.nick. Just make sure that's set appropriately, and thus plugin will do the rest.""" public = False From 0869a8e271e9951219dcddd228bec9cb08fc291f Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 23 Oct 2011 20:26:39 -0400 Subject: [PATCH 11/11] Channel.nicks: Raise error so we don't actually reply with the nicks. Closes: Sf#3396388 Signed-off-by: James McCoy --- plugins/Channel/plugin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Channel/plugin.py b/plugins/Channel/plugin.py index 7cb51f937..db12afb37 100644 --- a/plugins/Channel/plugin.py +++ b/plugins/Channel/plugin.py @@ -788,7 +788,8 @@ class Channel(callbacks.Plugin): msg.args[0] != channel and \ (ircutils.isChannel(msg.args[0]) or \ msg.nick not in irc.state.channels[channel].users): - irc.error('You don\'t have access to that information.') + irc.error('You don\'t have access to that information.', + Raise=True) L = list(irc.state.channels[channel].users) utils.sortBy(str.lower, L) irc.reply(utils.str.commaAndify(L))