X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fbasile.git;a=blobdiff_plain;f=basile.py;h=4ee806783efa2306f1f0afc738f7c3ad7e3bdc46;hp=f3c193c99a4f32fc2feaf90ea94a1346cdf1763b;hb=4d6cedfb164059e9c5c607db4752533ae7333b44;hpb=5076791b641fced9605fb52fd5ce56aacda40f89

diff --git a/basile.py b/basile.py
index f3c193c..4ee8067 100755
--- a/basile.py
+++ b/basile.py
@@ -54,6 +54,17 @@ def log(serveur, channel, auteur=None, message=None):
     if config.debug_stdout:
         print chain
 
+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 regex_join(liste, avant=u".*(?:^| )", apres=u"(?:$|\.| |,|;).*"):
     """Fabrique une regexp à partir d'une liste d'éléments à matcher."""
     return avant + u"(" + u"|".join(liste) + u")" + apres
@@ -425,7 +436,7 @@ class Basile(ircbot.SingleServerIRCBot):
             if auteur in self.ops and len(message) > 1:
                 if message[1] in self.chanlist:
                     if not (message[1] in self.stay_channels) or auteur in self.overops:
-                        self.quitter(message[1], " ".join(message[2:]))
+                        self.quitter(message[1].encode("utf-8"), " ".join(message[2:]))
                         self.chanlist.remove(message[1])
                         log(self.serveur, "priv", auteur, " ".join(message) + "[successful]")
                     else:
@@ -651,15 +662,15 @@ class Basile(ircbot.SingleServerIRCBot):
             elif cmd in [u"ping"] and not canal in self.quiet_channels:
                 serv.privmsg(canal, "%s: pong" % (auteur))
 
-            elif cmd in [u"solde", u"!solde", u"!coca"]:
+            elif cmd in [u"solde", u"!solde", u"!coca"] or cmd.startswith("!"):
                 if self.identities.has_key(auteur):
                     idbde = self.identities[auteur]["idbde"]
                     if cmd in [u"solde", u"!solde"]:
                         success, solde, pseudo = nk.get_solde(self.nk, self.identities[auteur]["idbde"], serv, canal)
                         if success:
                             serv.privmsg(canal, "%s: %s (%s)" % (auteur, float(solde)/100, pseudo.encode("utf8")))
-                    elif cmd in [u"!coca"]:
-                        success = nk.consomme(self.nk, self.identities[auteur]["idbde"], u"Coca", serv, canal)
+                    elif cmd in [u"!coca"] or cmd.startswith("!"):
+                        success = nk.consomme(self.nk, self.identities[auteur]["idbde"], message[1:], serv, canal)
                     log(self.serveur, canal, auteur, message + ("[successful]" if success else "[failed]"))
                 else:
                     serv.privmsg(canal, "%s: Je ne connais pas votre pseudo note." % (auteur))