X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=saturnin.py;h=58b5f30a83fa6296dd0e9cb32937ddb338a70d12;hb=5395e335c91b65186d35eacfa2e8215b55f01867;hp=f2b432c5f5a9326a9158148e19e7223ce22e83d2;hpb=b71142838d23a2e278774665a825e80a11a9bb6f;p=bots%2Fsaturnin.git

diff --git a/saturnin.py b/saturnin.py
index f2b432c..58b5f30 100755
--- a/saturnin.py
+++ b/saturnin.py
@@ -57,6 +57,18 @@ regexp_pan = re.compile(u".*(" + "|".join(config.killwords) + u").*")
 def is_pan(chain):
     return regexp_pan.match(unicode(chain,"utf8").lower())
 
+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
+
 class UnicodeBotError(Exception):
     pass
 def bot_unicode(chain):
@@ -116,6 +128,8 @@ class Saturnin(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:
@@ -449,9 +463,9 @@ class Saturnin(ircbot.SingleServerIRCBot):
         self.serv.privmsg(to, "Scores by pseudo : "+" ; ".join(["%s %s"%(i[0],i[1]) for i in scores]))
     
     def on_pubmsg(self, serv, ev):
-        auteur = irclib.nm_to_n(ev.source())
-        if re.match(config.ignored_pseudos, auteur):
+        if ignore_event(serv, ev):
             return
+        auteur = irclib.nm_to_n(ev.source())
         channel = ev.target()
         message = ev.arguments()[0]
         try:
@@ -497,6 +511,8 @@ class Saturnin(ircbot.SingleServerIRCBot):
                 self.shot(channel, auteur)
     
     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()