X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fsalesman.git;a=blobdiff_plain;f=salesman.py;h=dd0e82c1be01276392bd5b130412971c0f5d2aaa;hp=7966465ac54d83f80d547fd184b837b32606afdb;hb=HEAD;hpb=70a25ec579090f9081de06fee2ec4f5ee216d919

diff --git a/salesman.py b/salesman.py
index 7966465..dd0e82c 100755
--- a/salesman.py
+++ b/salesman.py
@@ -122,16 +122,16 @@ class Salesman(ircbot.SingleServerIRCBot):
         for c in self.chanlist:
             log(self.serveur,"JOIN %s"%(c))
             serv.join(c)
-        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]:
@@ -495,7 +495,7 @@ class Salesman(ircbot.SingleServerIRCBot):
                 serv.privmsg(canal,"%s: coucou"%(auteur))
             elif cmd in ["ping"] and not canal in self.quiet_channels:
                 serv.privmsg(canal,"%s: pong"%(auteur))
-            elif cmd in ["ville","capitale","pays","énigme","enigme","encore"]:
+            elif cmd in ["énigme","enigme","encore"]:
                 if canal in self.play_channels:
                     if self.play_status.get(canal,[-1])[0]==0:
                         try:
@@ -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)