else:
exceptit = bool(irclib.mask_matches(usermask, exceptmask))
blackit = bool(irclib.mask_matches(usermask, blackmask))
- return blackit and not exceptit
+ if blackit and not exceptit:
+ return True
def reussi(message,answer,answer_regexp,auteur):
if auteur in config.level3:
for c in self.chanlist:
log(self.serveur,"JOIN %s"%(c))
serv.join(c)
- self.update_activity(c,force=True)
for c in self.play_channels:
token=time.time()-3600
self.play_status[c]=[0,token]
- serv.execute_delayed(random.randrange(config.ttrig),self.start_enigme,(serv,c,token))
+ if config.auto_trigger:
+ serv.execute_delayed(random.randrange(config.ttrig),self.start_enigme,(serv,c,token))
def start_enigme(self,serv,channel,token=None):
# On reste silencieux si lechan n'est pas actif
if not self.is_active(channel):
- serv.execute_delayed(config.ttrig*5,self.start_enigme,(serv,channel,token))
+ if config.auto_trigger:
+ serv.execute_delayed(config.ttrig*5,self.start_enigme,(serv,channel,token))
return
if self.play_status[channel][0]==0 and channel in self.play_channels:
ok="skip"
serv.privmsg(channel,"C'était : %s"%(answer).encode("utf8"))
token=time.time()
self.play_status[channel]=[0,token]
- serv.execute_delayed(random.randrange(config.Ttrig*5,config.Ttrig*10),self.start_enigme,(serv,channel,token))
+ if config.auto_trigger:
+ serv.execute_delayed(random.randrange(config.Ttrig*5,config.Ttrig*10),self.start_enigme,(serv,channel,token))
def get_enigme(self):
# on récupère les déconnaissances
self.add_score(auteur,1)
token=time.time()
self.play_status[canal]=[0,token]
- serv.execute_delayed(random.randrange(config.Ttrig*5,config.Ttrig*10),self.start_enigme,(serv,canal,token))
+ if config.auto_trigger:
+ serv.execute_delayed(random.randrange(config.Ttrig*5,config.Ttrig*10),self.start_enigme,(serv,canal,token))
def on_kick(self,serv,ev):
auteur = irclib.nm_to_n(ev.source())
if force or (not pseudo in config.idle_bots and all([not re.match(ignore, message) for ignore in config.idle_messages])):
self.last_activity[canal]=time.time()
def is_active(self,canal):
- return time.time()-self.last_activity[canal]<config.idle_time
+ # Si on n'a pas d'info sur le chan, il est inactif
+ return time.time()-self.last_activity.get(canal, config.idle_time)<config.idle_time
def reload(self, auteur=None):
reload(config)