X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fthemis.git;a=blobdiff_plain;f=themis.py;h=c3a47f615ce7b07faea4e5db0bd921a98bf3dc34;hp=bfecf44944a516b96655bd10643c6c90b4f149e8;hb=HEAD;hpb=488c7e27a9bd1fdefaf65f98f3ae121cb7094857

diff --git a/themis.py b/themis.py
index bfecf44..c3a47f6 100755
--- a/themis.py
+++ b/themis.py
@@ -41,6 +41,18 @@ 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
+
 reg_is_smiley = re.compile(u".*("+u"|".join(config.smileys)+u")")
 def is_smiley(chain):
     chain=unicode(chain,"utf8")
@@ -184,6 +196,8 @@ class Themis(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:
@@ -383,6 +397,8 @@ class Themis(ircbot.SingleServerIRCBot):
             serv.privmsg(auteur,"Je n'ai pas compris. Essayez 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]
@@ -488,6 +504,8 @@ class Themis(ircbot.SingleServerIRCBot):
                     serv.privmsg(canal,answer.format(auteur).encode("utf8"))
 
     def on_action(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         action = ev.arguments()[0]
         auteur = irclib.nm_to_n(ev.source())
         channel = ev.target()
@@ -529,8 +547,8 @@ class Themis(ircbot.SingleServerIRCBot):
             print ev.source()
             print channel, username
             if channel == "#déprime" and "peb" in username or "becue" in username:
-                time.sleep(5)
-                serv.kick(auteur, "Va abuser de tes droits ailleurs !")
+                print "Kicking peb"
+                serv.execute_delayed(5, serv.kick, (auteur, "Va abuser de tes droits ailleurs !"))
     
     def kicker(self, chan, pseudo, raison=None):
         if raison==None: