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.
This commit is contained in:
Valentin Lorentz 2020-04-07 21:12:15 +02:00
parent c212ee0e5e
commit c489d2e9be

View File

@ -518,7 +518,6 @@ def getChannelDb(irc, msg, args, state, **kwargs):
try: try:
getChannel(irc, msg, args, state, **kwargs) getChannel(irc, msg, args, state, **kwargs)
channel = channelSpecific.getChannelLink(state.channel) channel = channelSpecific.getChannelLink(state.channel)
state.channel = channel
state.args[-1] = channel state.args[-1] = channel
except (callbacks.ArgumentError, IndexError): except (callbacks.ArgumentError, IndexError):
if channelSpecific(): if channelSpecific():
@ -530,7 +529,6 @@ def getChannelDb(irc, msg, args, state, **kwargs):
raise raise
else: else:
channel = channelSpecific.getChannelLink(channel) channel = channelSpecific.getChannelLink(channel)
state.channel = channel
state.args.append(channel) state.args.append(channel)
def inChannel(irc, msg, args, state): def inChannel(irc, msg, args, state):