X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fsaturnin.git;a=blobdiff_plain;f=saturnin.py;h=75165dfbe8615dfb1f891b93a853226db9a23e05;hp=3b43531fb133e9c3f8d04afd321438432c90e348;hb=67723acea4e7ac0f02bb428552c637c45002556e;hpb=fd087472ed16a00627af6fd60ea1e8d06374bfe1

diff --git a/saturnin.py b/saturnin.py
index 3b43531..75165df 100755
--- a/saturnin.py
+++ b/saturnin.py
@@ -56,11 +56,17 @@ def is_something(chain,matches,avant=u".*(?:^| )",apres=u"(?:$|\.| |,|;).*",case
 regexp_pan = re.compile(u".*(" + "|".join(config.killwords) + u").*")
 def is_pan(chain):
     return regexp_pan.match(unicode(chain,"utf8").lower())
-def ignore_pan(serv, ev):
-    """Retourne ``True`` si il faut ignorer ce pan."""
-    for (blackmask, exceptmask) in config.ignored_pan_masks:
+
+def ignore_event(serv, ev):
+    """Retourne ``True`` si il faut ignorer cet évènement."""
+    for (blackmask, exceptmask) in config.blacklisted_masks:
         usermask = ev.source()
-        return bool(irclib.mask_matches(usermask, blackmask) and not irclib.mask_matches(usermasl, exceptmask))
+        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
 
 class UnicodeBotError(Exception):
     pass
@@ -121,6 +127,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:
@@ -454,9 +462,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:
@@ -499,11 +507,11 @@ class Saturnin(ircbot.SingleServerIRCBot):
                 self.sendscores(auteur)
         else:
             if is_pan(message):
-                if ignore_pan(serv, ev):
-                    return
                 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()