mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-23 11:09:23 +01:00
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:
parent
c212ee0e5e
commit
c489d2e9be
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user