X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;ds=sidebyside;f=salesman.py;h=d7e00442ceed6264bdab22bb2018d00d34a80eb2;hb=cc61e659ac3677bed6687bc346411125482f9da0;hp=64dcd002a23926d81e8a9c280c202310109a173c;hpb=c1a1b09e8111f3883a43344a5bbb75810f7b6b9a;p=bots%2Fsalesman.git

diff --git a/salesman.py b/salesman.py
index 64dcd00..d7e0044 100755
--- a/salesman.py
+++ b/salesman.py
@@ -122,11 +122,10 @@ 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
@@ -597,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)