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

allows nick to be used as target for logChannel

Browse Source
This commit is contained in:
Nicolas Coevoet 2018-06-06 10:18:34 +02:00
parent 9874005392
commit 06013c8aa7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@ -88,7 +88,7 @@ conf.registerChannelValue(ChanTracker, 'autoExpire',
# announces related to logChannel
conf.registerChannelValue(ChanTracker, 'logChannel',
registry.String("", """where bot announces op's actions; it is highly recommended to set an appropriate operator's channel to receive the various useful messages"""),opSettable=False)
registry.String("", """where bot announces op's actions; it is highly recommended to set an appropriate operator's channel to receive the various useful messages, nick can be used"""),opSettable=False)
conf.registerChannelValue(ChanTracker, 'useColorForAnnounces',
registry.Boolean(False, """use colors for announce messages"""))

12
plugin.py
View File

@ -78,7 +78,7 @@ def matchHostmask (pattern,n,resolve):
if '/' in host:
if host.startswith('gateway/web/freenode/ip.'):
n.ip = cache[n.prefix] = host.split('ip.')[1]
elif n.ip != None and '@' in pattern and mcidr.match(pattern.split('@')[1]):
if n.ip != None and '@' in pattern and mcidr.match(pattern.split('@')[1]):
address = IPAddress('%s' % n.ip)
network = IPNetwork('%s' % pattern.split('@')[1], strict=False)
if address in network:
@ -2556,12 +2556,12 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
i.lowQueue.enqueue(ircmsgs.IrcMsg('NOTICE @%s :%s' % (logChannel,message)))
else:
i.lowQueue.enqueue(ircmsgs.IrcMsg('PRIVMSG @%s :%s' % (logChannel,message)))
elif len(logChannel) > 0:
if self.registryValue ('announceWithNotice',channel=channel):
i.lowQueue.enqueue(ircmsgs.notice(logChannel,message))
else:
if self.registryValue ('announceWithNotice',channel=channel):
i.lowQueue.enqueue(ircmsgs.notice(logChannel,message))
else:
i.lowQueue.enqueue(ircmsgs.privmsg(logChannel,message))
self.forceTickle = True
i.lowQueue.enqueue(ircmsgs.privmsg(logChannel,message))
self.forceTickle = True
def resolve (self,irc,channels,prefix):
i = self.getIrc(irc)