Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-25 12:12:54 +01:00
Code Issues Projects Releases Wiki Activity

supybot.defaultIgnore shouldn't ignore registered users.

Browse Source 
Even if they are not trusted. This fixes a regression in
97016b9c55.

This happens because 'user._checkCapability' raises a KeyError
when the user has neither this cap or the anticap; which was mistakenly
caught here by the 'except KeyError' expecting to catch non-existing
users.
(And that why 'try' blocks should be limited to as few lines as possible.)
This commit is contained in:
Valentin Lorentz 2020-10-26 00:06:56 +01:00
parent 160bcc8b6b
commit 76b5a42428
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ircdb.py
View File

@ -1172,18 +1172,25 @@ def checkIgnored(hostmask, recipient='', users=users, channels=channels):
try:
id = users.getUserId(hostmask)
user = users.getUser(id)
if user._checkCapability('trusted'):
# Trusted users (including owners) shouldn't ever be ignored.
return False
elif user.ignore:
log.debug('Ignoring %s due to their IrcUser ignore flag.', hostmask)
return True
except KeyError:
# If there's no user...
if conf.supybot.defaultIgnore():
log.debug('Ignoring %s due to conf.supybot.defaultIgnore',
hostmask)
return True
else:
try:
is_trusted = user._checkCapability('trusted')
except KeyError:
# neither explicitly trusted or -trusted -> consider them not
# trusted
is_trusted = False
if is_trusted:
# Trusted users (including owners) shouldn't ever be ignored.
return False
elif user.ignore:
log.debug('Ignoring %s due to their IrcUser ignore flag.', hostmask)
return True
if ignores.checkIgnored(hostmask):
log.debug('Ignoring %s due to ignore database.', hostmask)
return True