PsychoticNinja/ChanTracker
1
0
Fork 0
mirror of https://github.com/ncoevoet/ChanTracker.git synced 2025-04-26 04:51:07 -05:00
Code Issues Projects Releases Wiki Activity

prevent a NPE on mark deletion, and avoid load of notices in +q $~a

Browse Source
This commit is contained in:
Nicolas Coevoet 2021-06-30 22:30:05 +00:00
parent b98455e798
commit 63ea755d8f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin.py
View File

@ -3096,7 +3096,8 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler):
i.mark(irc, item.uid, reason, prefix,
self.getDb(irc.network), f, self)
key = '%s%s' % (m, value)
del chan.mark[key]
if key in chan.mark:
del chan.mark[key]
if irc.state.channels[channel].isHalfopPlus(irc.nick) and not self.registryValue('keepOp', channel=channel) and not chan.deopPending and not chan.deopAsked:
# ask for deop, delay it a bit
if not self.registryValue('doNothingAboutOwnOpStatus', channel=channel):
@ -4387,7 +4388,7 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler):
chan.queue.enqueue(('-h', nick))
if nick in irc.state.channels[channel].voices and not nick == irc.nick:
chan.queue.enqueue(('-v', nick))
if m == 'q' and len(self.registryValue('quietMessage', channel=channel)) and not chan.attacked:
if m == 'q' and len(self.registryValue('quietMessage', channel=channel)) and not chan.attacked and not value == '$~a':
qm = self.registryValue(
'quietMessage', channel=channel)
log.info(