From 7bd68df8aa2d3336e8966094aae389c8b1a27b3b Mon Sep 17 00:00:00 2001 From: Tasos Sahanidis Date: Sun, 12 Jan 2020 03:45:50 +0200 Subject: [PATCH] Fix getSpecific usage The channel and network arguments were incorrectly swapped --- plugins/Misc/plugin.py | 4 ++-- src/conf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py index 63ce7ac18..89843353b 100644 --- a/plugins/Misc/plugin.py +++ b/plugins/Misc/plugin.py @@ -155,7 +155,7 @@ class Misc(callbacks.Plugin): return # Now, for normal handling. if conf.supybot.reply.whenNotCommand.getSpecific( - channel, irc.network)(): + irc.network, channel)(): if len(tokens) >= 2: cb = irc.getCallback(tokens[0]) if cb: @@ -179,7 +179,7 @@ class Misc(callbacks.Plugin): if channel != irc.nick else _('private')) if irc.nested: bracketConfig = conf.supybot.commands.nested.brackets - brackets = bracketConfig.getSpecific(channel, irc.network)() + brackets = bracketConfig.getSpecific(irc.network, channel)() if brackets: (left, right) = brackets irc.reply(left + ' '.join(tokens) + right) diff --git a/src/conf.py b/src/conf.py index 9f54c6b7c..4f59c794b 100644 --- a/src/conf.py +++ b/src/conf.py @@ -1188,7 +1188,7 @@ class Banmask(registry.SpaceSeparatedSetOfStrings): bhost = '*' if not options: options = supybot.protocols.irc.banmask.getSpecific( - channel, network)() + network, channel)() for option in options: if option == 'nick': bnick = nick