Problèmes de trailing \n + on autorise à mettre des bêtises devant un réponse

[bots/salesman.git] / Salesman.py

diff --git a/Salesman.py b/Salesman.py
index 53409b5bf36bbe64d2f4aac04f1feb82f2548d52..b2717b4344a8cde47962418c86b1108ac00309d6 100755 (executable)
--- a/Salesman.py
+++ b/Salesman.py
@@ -82,7 +82,8 @@ def reussi(message,answer,auteur):
     if auteur in config_level2:
         return remplace_accents(answer) in message
     else:
-        if re.match(remplace_accents(answer).lower(),remplace_accents(message).lower()):
+        print remplace_accents(answer).lower(), '#?#', remplace_accents(message).lower()
+        if re.match(".*"+remplace_accents(answer).lower(),remplace_accents(message).lower()):
             return True
 
 def is_something(chain,matches,avant=u".*(?:^| )",apres=u"(?:$|\.| |,|;).*",case_sensitive=False,debug=False):
@@ -169,7 +170,7 @@ class Salesman(ircbot.SingleServerIRCBot):
     def get_enigme(self):
         # on récupère les capitales
         f=open(config_source_file)
-        l=f.readlines()
+        l=[i.strip("\n") for i in f.readlines()]
         f.close()
         l=[i.split(" | ") for i in l]
         dec={int(i[0]):list(i[1:]) for i in l}