From c489d2e9be19f1719e2bffb6a83581bd4cb24eb5 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 7 Apr 2020 21:12:15 +0200 Subject: [PATCH] Prevent getChannelDb from overriding state.channel set by getChannel. I don't see any use for this; and it means a 'channel' converter called after 'channeldb' returns '#' instead of the actual channel if it's after 'channeldb' in the arg list and databases.plugins.channelspecific is False. --- src/commands.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/commands.py b/src/commands.py index 102768f40..a7a90c396 100644 --- a/src/commands.py +++ b/src/commands.py @@ -518,7 +518,6 @@ def getChannelDb(irc, msg, args, state, **kwargs): try: getChannel(irc, msg, args, state, **kwargs) channel = channelSpecific.getChannelLink(state.channel) - state.channel = channel state.args[-1] = channel except (callbacks.ArgumentError, IndexError): if channelSpecific(): @@ -530,7 +529,6 @@ def getChannelDb(irc, msg, args, state, **kwargs): raise else: channel = channelSpecific.getChannelLink(channel) - state.channel = channel state.args.append(channel) def inChannel(irc, msg, args, state):