Vraiment pas d'auto-spawn

[bots/salesman.git] / salesman.py

diff --git a/salesman.py b/salesman.py
index 342b93f01c1975a151fcd2287e8d33156fae9d41..12394a5f036ea964a22524b359de024c7c559d64 100755 (executable)
--- a/salesman.py
+++ b/salesman.py
@@ -52,6 +52,17 @@ def log(serveur,channel,auteur=None,message=None):
         print chain
     f.close()
 
+def ignore_event(serv, ev):
+    """Retourne ``True`` si il faut ignorer cet évènement."""
+    for (blackmask, exceptmask) in config.blacklisted_masks:
+        usermask = ev.source()
+        if exceptmask is None:
+            exceptit = False
+        else:
+            exceptit = bool(irclib.mask_matches(usermask, exceptmask))
+        blackit = bool(irclib.mask_matches(usermask, blackmask))
+        if blackit and not exceptit:
+            return True
 
 def reussi(message,answer,auteur):
     if auteur in config.level3:
@@ -111,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]:
@@ -167,9 +177,7 @@ class Salesman(ircbot.SingleServerIRCBot):
         mini=min(played.values())
         # on choisit un id dans ceux qui ont ce nombre d'occurences
         id_choisi=random.choice([k for k,v in played.items() if v==mini])
-        capitale,pays=dec[id_choisi]
-        # on peut jouer capitale -> pays ou pays -> capitale
-        enigme,answer=random.choice([[capitale,pays],[pays,capitale]])
+        enigme,answer=dec[id_choisi]
         # on incrémente la choisie
         played[id_choisi]+=1
         # on enregistre le played_file
@@ -187,6 +195,8 @@ class Salesman(ircbot.SingleServerIRCBot):
             return (False,message)
 
     def on_privmsg(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         message=ev.arguments()[0]
         auteur = irclib.nm_to_n(ev.source())
         try:
@@ -433,6 +443,8 @@ class Salesman(ircbot.SingleServerIRCBot):
             serv.privmsg(auteur,"Je n'ai pas compris. Essaye HELP…")
     
     def on_pubmsg(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         auteur = irclib.nm_to_n(ev.source())
         canal = ev.target()
         message = ev.arguments()[0]
@@ -580,11 +592,12 @@ class Salesman(ircbot.SingleServerIRCBot):
         return self.serv.get_nickname()
     nick = property(_getnick)
     
-    def update_activity(self,canal,pseudo,message,force=False):
+    def update_activity(self,canal="",pseudo="",message="",force=False):
         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)