Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-11-04 01:27:21 +01:00
Code Issues Projects Releases Wiki Activity

ChannelStats: Skip checks of nick in irc.state.channels[channel] when channel databases are linked.

Browse Source 
It crashes with KeyError because databases.plugins.channelspecific sets
channel='#', which is a non-existent channel.
And it doesn't make sense to check for presence in channel if the DB is
shared between all channels anyway.
This commit is contained in:
Valentin Lorentz 2020-04-07 21:17:52 +02:00
parent c489d2e9be
commit 2bbd43fd85
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/ChannelStats/plugin.py
View File

@ -242,9 +242,11 @@ class ChannelStats(callbacks.Plugin):
necessary if the message isn't sent on the channel itself. If <name>
isn't given, it defaults to the user sending the command.
"""
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
if channel != '#':
# Skip this check if databases.plugins.channelspecific is False.
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
if name and ircutils.strEqual(name, irc.nick):
id = 0
elif not name:
@ -303,9 +305,11 @@ class ChannelStats(callbacks.Plugin):
'kicks', 'kicked', 'topics', and 'modes'. Any simple mathematical
expression involving those variables is permitted.
"""
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
if channel != '#':
# Skip this check if databases.plugins.channelspecific is False.
if msg.nick not in irc.state.channels[channel].users:
irc.error(format('You must be in %s to use this command.', channel))
return
expr = expr.lower()
users = []
for ((c, id), stats) in self.db.items():