little fix on check

This commit is contained in:
Nicolas Coevoet 2013-10-19 00:06:39 +02:00
parent 2dde337495
commit 4645b552fb

View File

@ -478,12 +478,25 @@ class Ircd (object):
chan = self.getChan(irc,channel) chan = self.getChan(irc,channel)
item = chan.getItem(mode,value) item = chan.getItem(mode,value)
if not item: if not item:
if not chan.deopAsked:
hash = '%s%s' % (mode,value) hash = '%s%s' % (mode,value)
# prepare item update after being set ( we don't have id yet ) # prepare item update after being set ( we don't have id yet )
chan.update[hash] = [mode,value,seconds,prefix] chan.update[hash] = [mode,value,seconds,prefix]
# enqueue mode changes # enqueue mode changes
chan.queue.enqueue(('+%s' % mode,value)) chan.queue.enqueue(('+%s' % mode,value))
return True return True
else:
# deop is asked so ircd will not allows touching mode
#def retry():
#if channel in irc.state.channels:
#if not chan.deopAsked:
#hash = '%s%s' % (mode,value)
#chan.update[hash] = [mode,value,seconds,prefix]
#chan.queue.enqueue(('+%s' % mode,value))
#else:
#self.add(irc,channel,mode,value,seconds,prefix,db,logFunction,addOnly)
#schedule.addEvent(retry,time.time()+2)
return False
return False return False
def mark (self,irc,uid,message,prefix,db,logFunction): def mark (self,irc,uid,message,prefix,db,logFunction):
@ -1233,7 +1246,7 @@ class ChanTracker(callbacks.Plugin,plugins.ChannelDBHandler):
if ircutils.isUserHostmask(pattern) or pattern.startswith('$'): if ircutils.isUserHostmask(pattern) or pattern.startswith('$'):
results = [] results = []
i = self.getIrc(irc) i = self.getIrc(irc)
for nick in irc.state.channels[channel].users.keys(): for nick in irc.state.channels[channel].users:
if nick in i.nicks: if nick in i.nicks:
n = self.getNick(irc,nick) n = self.getNick(irc,nick)
m = match(pattern,n) m = match(pattern,n)