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

added a new method modes, which permits to send raw modes that bypass anything and wait for op, fixed issues when using int for duration with editAndMark that eats the first param of reason, added a boolean to only show never expires items with pending

Browse Source
This commit is contained in:
Nicolas Coevoet 2014-01-31 20:51:17 +01:00
parent 3e64e12ded
commit 152ae296d7
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugin.py
View File

@ -374,7 +374,7 @@ class Ircd (object):
c.close() c.close()
return results return results
def pending(self,irc,channel,mode,prefix,pattern,db): def pending(self,irc,channel,mode,prefix,pattern,db,notExpiredOnly=False):
# returns active items for a channel mode # returns active items for a channel mode
if not channel or not mode or not prefix: if not channel or not mode or not prefix:
return [] return []
@ -389,7 +389,11 @@ class Ircd (object):
if len(items): if len(items):
for item in items: for item in items:
item = items[item] item = items[item]
r.append([item.uid,item.mode,item.value,item.by,item.when,item.expire]) if notExpiredOnly:
if item.when == item.expire or not item.expire:
r.append([item.uid,item.mode,item.value,item.by,item.when,item.expire])
else:
r.append([item.uid,item.mode,item.value,item.by,item.when,item.expire])
r.sort(reverse=True) r.sort(reverse=True)
if len(r): if len(r):
for item in r: for item in r:
@ -987,7 +991,6 @@ def getTs (irc, msg, args, state):
try: try:
n = int(arg) n = int(arg)
state.args.append(n) state.args.append(n)
args.pop(0)
except: except:
state.args.append(float(seconds)) state.args.append(float(seconds))
raise callbacks.ArgumentError raise callbacks.ArgumentError
@ -1061,7 +1064,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
f = None f = None
be = i.edit(irc,item.channel,item.mode,item.value,getDuration(seconds),msg.prefix,self.getDb(irc.network),self._schedule,f) be = i.edit(irc,item.channel,item.mode,item.value,getDuration(seconds),msg.prefix,self.getDb(irc.network),self._schedule,f)
f = None f = None
if self.registryValue('announceEdit',channel=item.channel): if self.registryValue('announceMark',channel=item.channel):
f = self._logChan f = self._logChan
if be: if be:
if reason and len(reason): if reason and len(reason):
@ -1184,7 +1187,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
irc.reply('nothing found') irc.reply('nothing found')
query = wrap(query,['private','user','text']) query = wrap(query,['private','user','text'])
def pending (self, irc, msg, args, channel, mode, pattern): def pending (self, irc, msg, args, channel, mode, pattern, notExpired):
"""[<channel>] [<mode>] [<nick|hostmask>] """[<channel>] [<mode>] [<nick|hostmask>]
returns active items for mode if given otherwise all modes are returned, if hostmask given, filtered by oper""" returns active items for mode if given otherwise all modes are returned, if hostmask given, filtered by oper"""
@ -1194,15 +1197,33 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
results = [] results = []
if not mode: if not mode:
modes = self.registryValue('modesToAskWhenOpped',channel=channel) + self.registryValue('modesToAsk',channel=channel) modes = self.registryValue('modesToAskWhenOpped',channel=channel) + self.registryValue('modesToAsk',channel=channel)
results = i.pending(irc,channel,modes,msg.prefix,pattern,self.getDb(irc.network)) results = i.pending(irc,channel,modes,msg.prefix,pattern,self.getDb(irc.network),False)
else: else:
results = i.pending(irc,channel,mode,msg.prefix,pattern,self.getDb(irc.network)) results = i.pending(irc,channel,mode,msg.prefix,pattern,self.getDb(irc.network),notExpired)
if len(results): if len(results):
irc.reply(' '.join(results), private=True) irc.reply(' '.join(results), private=True)
else: else:
irc.reply('no results') irc.reply('no results')
pending = wrap(pending,['op',additional('letter'),optional('hostmask')]) pending = wrap(pending,['op',additional('letter'),optional('hostmask'),optional('boolean')])
def _modes (self,numModes,chan,modes,f):
for i in range(0, len(modes), numModes):
chan.action.enqueue(f(modes[i:i + numModes]))
def modes (self, irc, msg, args, channel, modes):
"""[<channel>] <mode> [<arg> ...]
Sets the mode in <channel> to <mode>, sending the arguments given.
<channel> is only necessary if the message isn't sent in the channel
itself. it bypass autoexpire and everything, bot will ask for OP, if needed.
"""
def f(L):
return ircmsgs.modes(channel,L)
self._modes(irc.state.supported.get('modes', 1),self.getChan(irc,channel),ircutils.separateModes(modes),f)
self.forceTickle = True
self._tickle(irc)
modes = wrap(modes, ['op', many('something')])
def do (self,irc,msg,args,channel,mode,items,seconds,reason): def do (self,irc,msg,args,channel,mode,items,seconds,reason):
"""[<channel>] <mode> <nick|hostmask>[,<nick|hostmask>] [<years>y] [<weeks>w] [<days>d] [<hours>h] [<minutes>m] [<seconds>s] [<-1> or empty means forever] <reason> """[<channel>] <mode> <nick|hostmask>[,<nick|hostmask>] [<years>y] [<weeks>w] [<days>d] [<hours>h] [<minutes>m] [<seconds>s] [<-1> or empty means forever] <reason>
@ -2680,7 +2701,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
if irc.nick in irc.state.channels[channel].ops and not self.registryValue('keepOp',channel=channel): if irc.nick in irc.state.channels[channel].ops and not self.registryValue('keepOp',channel=channel):
self.forceTickle = True self.forceTickle = True
if self.registryValue('announceMode',channel=channel) and len(msgs): if self.registryValue('announceMode',channel=channel) and len(msgs):
self._logChan(irc,channel,'[%s] %s sets %s' % (channel,msg.prefix,' '.join(msgs))) self._logChan(irc,channel,'[%s] %s sets %s' % (channel,msg.nick,' '.join(msgs)))
self.forceTickle = True self.forceTickle = True
if len(toexpire): if len(toexpire):
for item in toexpire: for item in toexpire: