J'en avais marre de trigger Basile

[bots/hung.git] / hung.py

diff --git a/hung.py b/hung.py
index e4c4615dd0f604b4edff0937fd1f2cf85688aa42..f1214cbedbf79a01497a6acfa56c8e18c47ecb26 100755 (executable)
--- a/hung.py
+++ b/hung.py
@@ -145,12 +145,12 @@ class Hung(ircbot.SingleServerIRCBot):
                 if len(message)>1:
                     if message[1] in self.play_channels:
                         serv.privmsg(auteur,"Je play déjà sur %s."%(message[1]))
-                        log("priv",auteur," ".join(message)+"[failed]")
+                        log(self.serveur,"priv",auteur," ".join(message)+"[failed]")
                     else:
                         self.play_channels.append(message[1])
                         self.play_status[message[1]]=[None]
                         serv.privmsg(auteur,"Play channels : "+" ".join(self.play_channels))
-                        log("priv",auteur," ".join(message)+"[successful]")
+                        log(self.serveur,"priv",auteur," ".join(message)+"[successful]")
                 else:
                     serv.privmsg(auteur,"Play channels : "+" ".join(self.play_channels))
             else:
@@ -161,10 +161,10 @@ class Hung(ircbot.SingleServerIRCBot):
                     if message[1] in self.play_channels:
                         self.play_channels.remove(message[1])
                         serv.privmsg(auteur,"Play channels : "+" ".join(self.play_channels))
-                        log("priv",auteur," ".join(message)+"[successful]")
+                        log(self.serveur,"priv",auteur," ".join(message)+"[successful]")
                     else:
                         serv.privmsg(auteur,"Je ne play pas sur %s."%(message[1]))
-                        log("priv",auteur," ".join(message)+"[failed]")
+                        log(self.serveur,"priv",auteur," ".join(message)+"[failed]")
             else:
                 notunderstood=True
         elif cmd=="stay":
@@ -197,7 +197,7 @@ class Hung(ircbot.SingleServerIRCBot):
         elif cmd in ["states","status"]:
             if auteur in self.overops:
                 for k in self.play_status.keys():
-                    serv.privmsg(auteur,"%s : %s"%(k,"; ".join([str(i) for i in self.play_status[k]])))
+                    serv.privmsg(auteur,"%s : %s"%(k,"".join([str(i[0]) for i in self.play_status[k]])))
         elif cmd=="die":
             if auteur in self.overops:
                 log(self.serveur,"priv",auteur," ".join(message)+"[successful]")
@@ -319,7 +319,7 @@ class Hung(ircbot.SingleServerIRCBot):
                 listeapres=[(lettre[0],lettre[1] or lettre[0]==giv_let) for lettre in liste]
                 if liste!=listeapres:
                     self.play_status[canal]=listeapres
-                    self.affiche_mot(serv, canal, begin="%s trouvé"%(giv_let))
+                    self.affiche_mot(serv, canal, begin="%s placé"%(giv_let))
                 if all([lettre[1] for lettre in listeapres]):
                     serv.privmsg(canal,"Bravo ! C'était %s"%("".join([lettre[0] for lettre in listeapres])))
                     self.play_status[canal]=[None]