On ne trigger plus sur ville/capitale/pays

[bots/salesman.git] / salesman.py

diff --git a/salesman.py b/salesman.py
index fa5e81e896bf7fa98b2dc8fb3dccac9f1415df9c..dd0e82c1be01276392bd5b130412971c0f5d2aaa 100755 (executable)
--- 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: