X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fibot.git;a=blobdiff_plain;f=ibot.py;fp=ibot.py;h=250649155841afb42920d5e02c7ea4646bebed10;hp=c18a3dac03049205e09cff4076c7f656e04a02e2;hb=d3d8977cae013c61be72a55ab7ab20d31908b593;hpb=c18efd9a757c9a41c286bd1da6c326d2d4cabc59

diff --git a/ibot.py b/ibot.py
index c18a3da..2506491 100755
--- a/ibot.py
+++ b/ibot.py
@@ -46,6 +46,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))
+        return blackit and not exceptit
+
 def is_something(chain,matches,avant=u".*(?:^| )",apres=u"(?:$|\.| |,|;).*",case_sensitive=False,debug=False):
     if case_sensitive:
         chain=unicode(chain,"utf8")
@@ -161,6 +172,8 @@ class Ibot(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:
@@ -395,6 +408,8 @@ class Ibot(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]
@@ -440,6 +455,8 @@ class Ibot(ircbot.SingleServerIRCBot):
                 serv.kick(canal, auteur, u"iKick".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()