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

diff --git a/saturnin.py b/saturnin.py
index 3438020..75165df 100755
--- a/saturnin.py
+++ b/saturnin.py
@@ -57,6 +57,17 @@ 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))
+        return blackit and not exceptit
+
 class UnicodeBotError(Exception):
     pass
 def bot_unicode(chain):
@@ -116,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:
@@ -306,6 +319,11 @@ class Saturnin(ircbot.SingleServerIRCBot):
                         log(self.serveur,"priv",auteur," ".join(message)+"[failed]")
             else:
                 notunderstood=True
+        elif cmd=="status":
+            if auteur in self.ops:
+                serv.privmsg(auteur,"Status : %s" % (self.status, ))
+            else:
+                notunderstood=True
         elif cmd=="spawn":
             if auteur in self.ops:
                 if len(message)>1:
@@ -444,6 +462,8 @@ 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):
+        if ignore_event(serv, ev):
+            return
         auteur = irclib.nm_to_n(ev.source())
         channel = ev.target()
         message = ev.arguments()[0]
@@ -490,6 +510,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()