mirror of
https://github.com/ncoevoet/ChanTracker.git
synced 2025-04-25 20:41:19 -05:00
modified announceMode, now it's announceModes with list of modes to announce, you can also choose to use notice or privmsg for announces
This commit is contained in:
Nicolas Coevoet
parent
a02eabca9d
commit
f11f327e90
10
config.py
10
config.py
@ -83,11 +83,11 @@ conf.registerChannelValue(ChanTracker, 'announceOthers',
|
||||
registry.Boolean(True,"""forward messages from quieted/banned users to logChannel; used when bot stays opped and channel is +z (reduced moderation).
|
||||
Messages from users flagged as bad, or when channel is under attack will not be forwarded"""))
|
||||
|
||||
conf.registerChannelValue(ChanTracker, 'announceMode',
|
||||
registry.Boolean(True,"""announce all channel mode changes to logChannel"""))
|
||||
|
||||
conf.registerChannelValue(ChanTracker, 'announceVoiceAndOpMode',
|
||||
registry.Boolean(True,"""announce channel mode changes for op, halfop and voice to logChannel"""))
|
||||
conf.registerChannelValue(ChanTracker, 'announceWithNotice',
|
||||
registry.Boolean(False,"""use NOTICE instead of PRIVMSG to logChannel"""))
|
||||
|
||||
conf.registerChannelValue(ChanTracker, 'announceModes',
|
||||
registry.CommaSeparatedListOfStrings(['b','q','e','I','r','l','v','o','h','k','n','t','F'],"""announce modes listed to logChannel"""))
|
||||
|
||||
conf.registerChannelValue(ChanTracker, 'announceModeSync',
|
||||
registry.Boolean(False,"""announce to logChannel that synchronisation of channel modes to tracking database has completed"""))
|
||||
|
||||
57
plugin.py
57
plugin.py
@ -54,12 +54,11 @@ ircutils._hostmaskPatternEqualCache = utils.structures.CacheDict(4000)
|
||||
cache = utils.structures.CacheDict(4000)
|
||||
|
||||
def applymodes(channel, args=(), prefix='', msg=None):
|
||||
"""Returns a MODE that applies changes on channel."""
|
||||
modes = args
|
||||
if msg and not prefix:
|
||||
prefix = msg.prefix
|
||||
return ircmsgs.IrcMsg(prefix=prefix, command='MODE',
|
||||
args=[channel] + ircutils.joinModes(modes), msg=msg)
|
||||
"""Returns a MODE that applies changes on channel."""
|
||||
modes = args
|
||||
if msg and not prefix:
|
||||
prefix = msg.prefix
|
||||
return ircmsgs.IrcMsg(prefix=prefix, command='MODE', args=[channel] + ircutils.joinModes(modes), msg=msg)
|
||||
|
||||
def matchHostmask (pattern,n):
|
||||
# return the machted pattern for Nick
|
||||
@ -1973,7 +1972,10 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
|
||||
logChannel = self.registryValue('logChannel',channel=channel)
|
||||
if logChannel in irc.state.channels:
|
||||
i = self.getIrc(irc)
|
||||
i.lowQueue.enqueue(ircmsgs.privmsg(logChannel,message))
|
||||
if self.registryValue ('announceWithNotice',channel=channel):
|
||||
i.lowQueue.enqueue(ircmsgs.notice(logChannel,message))
|
||||
else:
|
||||
i.lowQueue.enqueue(ircmsgs.privmsg(logChannel,message))
|
||||
self.forceTickle = True
|
||||
|
||||
def doJoin (self,irc,msg):
|
||||
@ -2669,14 +2671,16 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
|
||||
modes = ircutils.separateModes(msg.args[1:])
|
||||
chan = self.getChan(irc,channel)
|
||||
msgs = []
|
||||
announces = list(self.registryValue('announceModes',channel=channel))
|
||||
overexpire = self.registryValue('autoExpire',channel=channel)
|
||||
for change in modes:
|
||||
(mode,value) = change
|
||||
m = mode[1:]
|
||||
log.debug('%s - %s / %s' % (mode,value,m))
|
||||
if value:
|
||||
value = value.lstrip().rstrip()
|
||||
value = str(value).lstrip().rstrip()
|
||||
item = None
|
||||
if '+' in mode:
|
||||
m = mode[1:]
|
||||
if m in self.registryValue('modesToAskWhenOpped',channel=channel) or m in self.registryValue('modesToAsk',channel=channel):
|
||||
item = chan.addItem(m,value,msg.prefix,now,self.getDb(irc.network))
|
||||
if msg.nick != irc.nick and self.registryValue('askOpAboutMode',channel=channel) and ircdb.checkCapability(msg.prefix, '%s,op' % channel):
|
||||
@ -2728,7 +2732,6 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
|
||||
# flush pending queue, if items are waiting
|
||||
self.forceTickle = True
|
||||
else:
|
||||
m = mode[1:]
|
||||
if m == 'o' and value == irc.nick:
|
||||
# prevent bot to sent many -o modes when server takes time to reply
|
||||
chan.deopAsked = False
|
||||
@ -2740,40 +2743,39 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
|
||||
if item:
|
||||
if '+' in mode:
|
||||
if not len(item.affects):
|
||||
if self.registryValue('announceMode',channel=channel):
|
||||
if m in announces:
|
||||
msgs.append('[#%s %s %s]' % (str(item.uid),mode,value))
|
||||
elif len(item.affects) != 1:
|
||||
if self.registryValue('announceMode',channel=channel):
|
||||
if m in announces:
|
||||
msgs.append('[#%s %s %s - %s users]' % (str(item.uid),mode,value,str(len(item.affects))))
|
||||
else:
|
||||
if self.registryValue('announceMode',channel=channel):
|
||||
if m in announces:
|
||||
msgs.append('[#%s %s %s - %s]' % (str(item.uid),mode,value,item.affects[0]))
|
||||
else:
|
||||
if not len(item.affects):
|
||||
if self.registryValue('announceMode',channel=channel):
|
||||
if m in announces:
|
||||
msgs.append('[#%s %s %s %s]' % (str(item.uid),mode,value,str(utils.timeElapsed(item.removed_at-item.when))))
|
||||
elif len(item.affects) != 1:
|
||||
if self.registryValue('announceMode',channel=channel):
|
||||
if m in announces:
|
||||
msgs.append('[#%s %s %s - %s users, %s]' % (str(item.uid),mode,value,str(len(item.affects)),str(utils.timeElapsed(item.removed_at-item.when))))
|
||||
else:
|
||||
if self.registryValue('announceMode',channel=channel):
|
||||
if m in announces:
|
||||
msgs.append('[#%s %s %s - %s, %s]' % (str(item.uid),mode,value,item.affects[0],str(utils.timeElapsed(item.removed_at-item.when))))
|
||||
else:
|
||||
if mode.find ('o') != -1 or mode.find('h') != -1 or mode.find ('v') != -1:
|
||||
if self.registryValue('announceVoiceAndOpMode',channel=channel):
|
||||
msgs.append('[%s %s]' % (mode,value))
|
||||
else:
|
||||
if m in announces:
|
||||
msgs.append('[%s %s]' % (mode,value))
|
||||
else:
|
||||
log.debug('%s --> %s' % (m,m in announces))
|
||||
if n:
|
||||
n.addLog(channel,'sets %s' % mode)
|
||||
msgs.append(mode)
|
||||
if m in announces:
|
||||
msgs.append(mode)
|
||||
if toCommit:
|
||||
db.commit()
|
||||
c.close()
|
||||
if irc.nick in irc.state.channels[channel].ops and not self.registryValue('keepOp',channel=channel):
|
||||
self.forceTickle = True
|
||||
if self.registryValue('announceMode',channel=channel) and len(msgs):
|
||||
if len(self.registryValue('announceModes',channel=channel)) and len(msgs):
|
||||
self._logChan(irc,channel,'[%s] %s sets %s' % (channel,msg.nick,' '.join(msgs)))
|
||||
self.forceTickle = True
|
||||
if len(toexpire):
|
||||
@ -2801,12 +2803,11 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
|
||||
def do478(self,irc,msg):
|
||||
# message when ban list is full after adding something to eqIb list
|
||||
(nick,channel,ban,info) = msg.args
|
||||
if info == 'Channel ban list is full':
|
||||
if self.registryValue('logChannel',channel=channel) in irc.state.channels:
|
||||
L = []
|
||||
for user in list(irc.state.channels[self.registryValue('logChannel',channel=channel)].users):
|
||||
L.append(user)
|
||||
self._logChan(irc,channel,'[%s] %s : %s' % (channel,info,' '.join(L)))
|
||||
if self.registryValue('logChannel',channel=channel) in irc.state.channels:
|
||||
L = []
|
||||
for user in list(irc.state.channels[self.registryValue('logChannel',channel=channel)].users):
|
||||
L.append(user)
|
||||
self._logChan(irc,channel,'[%s] %s : %s' % (channel,info,' '.join(L)))
|
||||
self._tickle(irc)
|
||||
|
||||
# protection features
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user