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

Untangle previous commit and more.

Browse Source
This commit is contained in:
Krytarik Raido 2021-07-01 12:45:04 +02:00
parent 96ea85c3b9
commit 0659919ad2
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugin.py
View File

@ -3053,11 +3053,11 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler):
key = '%s%s' % (m, value)
if key in chan.mark:
del chan.mark[key]
if (irc.state.channels[channel].isHalfopPlus(irc.nick)
and not self.registryValue('keepOp', channel=channel)) \
or chan.deopPending or chan.deopAsked:
if irc.state.channels[channel].isHalfopPlus(irc.nick) \
and not (self.registryValue('keepOp', channel=channel)
or self.registryValue('doNothingAboutOwnOpStatus', channel=channel)
or chan.deopPending or chan.deopAsked):
# ask for deop, delay it a bit
if not self.registryValue('doNothingAboutOwnOpStatus', channel=channel):
self.unOp(irc, channel)
# mostly logChannel, and maybe few sync msgs
if len(i.lowQueue):
@ -4184,12 +4184,12 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler):
if chan.deopPending:
return
def unOpBot():
if channel in irc.state.channels:
if not (len(i.queue) or len(chan.queue)):
if irc.state.channels[channel].isHalfopPlus(irc.nick) \
and not self.registryValue('keepOp', channel=channel):
if not chan.deopAsked:
if channel in irc.state.channels \
and irc.state.channels[channel].isHalfopPlus(irc.nick) \
and not (self.registryValue('keepOp', channel=channel)
or chan.deopAsked):
chan.deopPending = False
if not (len(i.queue) or len(chan.queue)):
chan.deopAsked = True
irc.queueMsg(ircmsgs.deop(channel, irc.nick))
# little trick here, tickle before setting deopFlag
@ -4197,10 +4197,6 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler):
self._tickle(irc)
else:
# reask for deop
if (irc.state.channels[channel].isHalfopPlus(irc.nick)
and not self.registryValue('keepOp', channel=channel)) \
and not chan.deopAsked:
self.deopPending = False
self.unOp(irc, channel)
chan.deopPending = True
schedule.addEvent(unOpBot, float(time.time()+10))