PsychoticNinja/ChanTracker
1
0
Fork 0
mirror of https://github.com/ncoevoet/ChanTracker.git synced 2025-04-25 20:41:19 -05:00
Code Issues Projects Releases Wiki Activity

Rework notification system.

Browse Source
This commit is contained in:
Krytarik Raido 2021-07-01 22:34:04 +02:00
parent 8250443443
commit d7b888b8eb
2 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config.py
View File

@ -195,19 +195,24 @@ conf.registerChannelValue(ChanTracker, 'kickMax',
conf.registerChannelValue(ChanTracker, 'kickMessage',
registry.CommaSeparatedListOfStrings(["You are banned from this channel"], """bot kick reason"""))
conf.registerChannelValue(ChanTracker, 'quietMessage',
registry.String("", """leave empty if you don't want the bot to tell something to the user when they have been quieted (by/via the bot);
in any case, if channel is under attack, bot will not send message; if filled, the operator nick will be given for accountability"""))
conf.registerChannelValue(ChanTracker, 'quietNotice',
registry.Boolean(False, """if False, private message is used, if quietMessage is not empty"""))
conf.registerChannelValue(ChanTracker, 'banMessage',
registry.String("", """leave empty if you don't want the bot to tell something to the user when they have been banned (by/via the bot);
in any case, if channel is under attack, bot will not send message; if filled, the operator nick will be given for accountability"""))
registry.String("You have been banned on $channel", """set empty if you don't want the bot to tell something to the user
when they have been banned (by/via the bot); in any case, if channel is under attack, bot will not send message;
if filled, the operator nick will be given for accountability if differing"""))
conf.registerChannelValue(ChanTracker, 'banNotice',
registry.Boolean(False, """if False, private message is used, if banMessage is not empty"""))
registry.Boolean(True, """if False, private message is used, if banMessage is not empty"""))
conf.registerChannelValue(ChanTracker, 'quietMessage',
registry.String("You have been quieted on $channel", """set empty if you don't want the bot to tell something to the user
when they have been quieted (by/via the bot); in any case, if channel is under attack, bot will not send message;
if filled, the operator nick will be given for accountability if differing"""))
conf.registerChannelValue(ChanTracker, 'quietNotice',
registry.Boolean(True, """if False, private message is used, if quietMessage is not empty"""))
conf.registerChannelValue(ChanTracker, 'proxyMsgOnly',
registry.Boolean(True, """only send message to user on operator action if it was proxied through the bot"""))
conf.registerChannelValue(ChanTracker, 'trackAffected',
registry.Boolean(True, """bot tracks affected users by mode change; if you encounter too much lag or cpu usage, you could disable this feature,

58
plugin.py
View File

@ -4340,7 +4340,7 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler):
chan.action.enqueue(ircmsgs.kick(channel, nick, km))
self.forceTickle = True
kicked = True
elif m == 'b' and not kicked:
elif m == 'b' and not (kicked or chan.attacked):
if msg.nick in (irc.nick, 'ChanServ'):
bm = self.registryValue('banMessage', channel=channel)
if len(bm):
@ -4350,35 +4350,43 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler):
(nn, ii, hh) = ircutils.splitHostmask(chan.update[hk][3])
if nn != irc.nick:
bm += ' (by %s)' % nn
log.info('[%s] warned %s with: %s' % (channel, nick, bm))
if self.registryValue('banNotice', channel=channel):
irc.queueMsg(ircmsgs.notice(nick, bm))
else:
irc.queueMsg(ircmsgs.privmsg(nick, bm))
if not kicked and m in self.registryValue('modesToAsk', channel=channel) \
and self.registryValue('doActionAgainstAffected', channel=channel):
elif self.registryValue('proxyMsgOnly', channel=channel):
qm = ''
if len(bm):
bm.replace('$channel', channel)
log.info('[%s] warned %s with: %s' % (channel, nick, bm))
if self.registryValue('banNotice', channel=channel):
i.lowQueue.enqueue(ircmsgs.notice(nick, bm))
else:
i.lowQueue.enqueue(ircmsgs.privmsg(nick, bm))
elif m == 'q' and not (kicked or chan.attacked or value == '$~a'):
if msg.nick in (irc.nick, 'ChanServ'):
if nick != irc.nick:
if nick in irc.state.channels[channel].ops:
chan.queue.enqueue(('-o', nick))
if nick in irc.state.channels[channel].halfops:
chan.queue.enqueue(('-h', nick))
if nick in irc.state.channels[channel].voices:
chan.queue.enqueue(('-v', nick))
if m == 'q' and not (chan.attacked or value == '$~a'):
qm = self.registryValue('quietMessage', channel=channel)
qm = self.registryValue('quietMessage', channel=channel)
if len(qm):
hk = '%s%s' % (m, value)
if hk in chan.update and len(chan.update[hk]) == 4:
if ircutils.isUserHostmask(chan.update[hk][3]):
(nn, ii, hh) = ircutils.splitHostmask(chan.update[hk][3])
if nn != irc.nick:
qm += ' (by %s)' % nn
elif self.registryValue('proxyMsgOnly', channel=channel):
qm = ''
if len(qm):
hk = '%s%s' % (m, value)
if hk in chan.update and len(chan.update[hk]) == 4:
if ircutils.isUserHostmask(chan.update[hk][3]):
(nn, ii, hh) = ircutils.splitHostmask(chan.update[hk][3])
if nn != irc.nick:
qm += ' (by %s)' % nn
qm.replace('$channel', channel)
log.info('[%s] warned %s with: %s' % (channel, nick, qm))
if self.registryValue('quietNotice', channel=channel):
irc.queueMsg(ircmsgs.notice(nick, qm))
i.lowQueue.enqueue(ircmsgs.notice(nick, qm))
else:
irc.queueMsg(ircmsgs.privmsg(nick, qm))
i.lowQueue.enqueue(ircmsgs.privmsg(nick, qm))
if not kicked and m in self.registryValue('modesToAsk', channel=channel) \
and self.registryValue('doActionAgainstAffected', channel=channel) \
and msg.nick in (irc.nick, 'ChanServ') and nick != irc.nick:
if nick in irc.state.channels[channel].ops:
chan.queue.enqueue(('-o', nick))
if nick in irc.state.channels[channel].halfops:
chan.queue.enqueue(('-h', nick))
if nick in irc.state.channels[channel].voices:
chan.queue.enqueue(('-v', nick))
if m in self.registryValue('kickMode', channel=channel) \
and not value.startswith('m:') and self.registryValue(
'kickOnMode', channel=channel):