On peut consommer des cocas \o/

[bots/basile.git] / basile.py

diff --git a/basile.py b/basile.py
index 70de88fa9e0b3aebc9c9f20df24e7fa7fddda8c4..b467ac85b33c72387723d45b1f3daa2fb813017b 100755 (executable)
--- a/basile.py
+++ b/basile.py
@@ -314,7 +314,7 @@ class Basile(ircbot.SingleServerIRCBot):
             if irclib.is_channel(place):
                 message = "%s: %s" % (auteur, message.encode("utf-8"))
             self.serv.privmsg(place, message)
-        log(self.serveur, place, auteur, something + "%r" % params + "[successful]" if success else "[failed]")
+        log(self.serveur, place, auteur, something + "%r" % params + ("[successful]" if success else "[failed]"))
     
     ### Surcharge des events du Bot
     def on_welcome(self, serv, ev):
@@ -560,7 +560,7 @@ class Basile(ircbot.SingleServerIRCBot):
                     success, solde, pseudo = nk.get_solde(self.nk, self.identities[auteur]["idbde"], serv, auteur)
                     if success:
                         serv.privmsg(auteur, "%s (%s)" % (float(solde)/100, pseudo.encode("utf8")))
-                    log(self.serveur, "priv", auteur, " ".join(message) + "[successful]" if success else "[failed]")
+                    log(self.serveur, "priv", auteur, " ".join(message) + ("[successful]" if success else "[failed]"))
                 else:
                     serv.privmsg(canal, "Je ne connais pas ton pseudo note.")
         elif cmd == u"ops":
@@ -651,13 +651,16 @@ 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"]:
+            elif cmd in [u"solde", u"!solde", u"!coca"]:
                 if self.identities.has_key(auteur):
                     idbde = self.identities[auteur]["idbde"]
-                    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")))
-                    log(self.serveur, canal, auteur, message + "[successful]" if success else "[failed]")
+                    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)
+                    log(self.serveur, canal, auteur, message + ("[successful]" if success else "[failed]"))
                 else:
                     serv.privmsg(canal, "%s: Je ne connais pas votre pseudo note." % (auteur))
                     log(self.serveur, canal, auteur, message + "[unknown]")