X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=salesman.py;h=12394a5f036ea964a22524b359de024c7c559d64;hb=e0b0ab6ab3a2e98dd023dce0483285151294f524;hp=5fe5c944b03eb7fa56b801ff8c52ea429e251d0b;hpb=2e1b93d9611408d87881b8d02188f034cece59cd;p=bots%2Fsalesman.git

diff --git a/salesman.py b/salesman.py
index 5fe5c94..12394a5 100755
--- a/salesman.py
+++ b/salesman.py
@@ -61,7 +61,8 @@ def ignore_event(serv, ev):
         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,auteur):
     if auteur in config.level3:
@@ -121,17 +122,16 @@ class Salesman(ircbot.SingleServerIRCBot):
         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))
+        #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))
 
     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))
-            return
+        #if not self.is_active(channel):
+        #    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"
             if token==self.play_status[channel][-1]:
@@ -596,7 +596,8 @@ class Salesman(ircbot.SingleServerIRCBot):
         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)