X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fbasile.git;a=blobdiff_plain;f=nk.py;h=a9e8a5c9d923b11d27cbb596cdd9e9e015bf7a2d;hp=6de4691497ac52b34fa01a47940d567b82e74fa9;hb=71e90399847a7a3a6d20ed8f0dc11a0966fe9b58;hpb=8d3075adfb57fa76cb1841eb1aeab048cc41bd0d

diff --git a/nk.py b/nk.py
index 6de4691..a9e8a5c 100644
--- a/nk.py
+++ b/nk.py
@@ -97,7 +97,7 @@ def get_solde(sock, idbde, serv, canal):
             pseudo = ret["msg"]["pseudo"]
             return (True, solde, pseudo)
         else:
-            serv.privmsg(canal, ret["errmsg"])
+            serv.privmsg(canal, ret["errmsg"].encode("utf-8"))
             return (False, None, None)
     except Exception as exc:
         trace = traceback.format_exc()
@@ -115,18 +115,21 @@ def consomme(sock, idbde, conso, serv, canal):
         retcode = ret["retcode"]
         if retcode == 0:
             boutons = ret["msg"]
-            ibouton = [b["label"].lower() for b in boutons].index(conso.lower())
-            bouton = boutons[ibouton]
+            boutons = [b for b in boutons if b["label"].lower() == conso.lower()]
+            if len(boutons) == 0:
+                serv.privmsg(canal, (u"Impossible de trouver la conso %s" % (conso)).encode("utf-8"))
+                return False
+            bouton = boutons[0]
             sock.write(json.dumps(["consos", [[bouton["id"], idbde, 1]]]))
             ret = full_read(sock)
             if ret["retcode"] == 0:
                 [[retcode, [idbouton, idbde], errmsg]] = ret["msg"]
                 if retcode != 0:
-                    serv.privmsg(canal, errmsg)
+                    serv.privmsg(canal, errmsg.encode("utf-8"))
                 else:
                     success, solde, pseudo = get_solde(sock, idbde, serv, canal)
                     if success:
-                        serv.privmsg(canal, (u"%s consomme 1 %s (nouveau solde : %s)" % (pseudo, bouton["label"], solde)).encode("utf-8"))
+                        serv.privmsg(canal, (u"%s consomme 1 %s (nouveau solde : %.2f)" % (pseudo, bouton["label"], solde/100.0)).encode("utf-8"))
                     else:
                         serv.privmsg(canal, (u"%s consommé mais impossible de récupérer le solde après transaction." % (bouton["label"])).encode("utf-8"))
                     return True # on a réussi à consommer la conso