X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=parrot.py;h=01ed82adecb1070b80b7d6c86928723b6ba46a2f;hb=09d929c80db13d5d8b3d775262a4b4252f862a79;hp=4ee3b23a6692399a93c3258ffa15aa7b3141628b;hpb=5dc10fbec825b8bd297a6cf6f3065242963968f0;p=bots%2Fparrot.git

diff --git a/parrot.py b/parrot.py
index 4ee3b23..01ed82a 100755
--- a/parrot.py
+++ b/parrot.py
@@ -26,7 +26,7 @@ import errors
 #: Module de gestion des quotes
 import quotes
 
-quote_pattern = re.compile(config.quote_regexp)
+quote_pattern = re.compile(config.quote_regexp, flags=re.UNICODE)
 
 def get_config_logfile(serveur):
     """Renvoie le nom du fichier de log en fonction du ``serveur`` et de la config."""
@@ -85,7 +85,8 @@ class Parrot(ircbot.SingleServerIRCBot):
         self.last_perdu = 0
         
         self.quotedb = quotes.QuoteDB()
-        self.quotedb.load()
+        self.reload_quotes()
+
     
     ### Utilitaires
     def _getnick(self):
@@ -95,7 +96,7 @@ class Parrot(ircbot.SingleServerIRCBot):
     
     def give_me_my_pseudo(self, serv):
         """Récupère le pseudo auprès de NickServ."""
-        serv.privmsg("NickServ", "RECOVER %s %s" % (config.irc_pseudo, config.irc_password))
+        serv.privmsg("NickServ", "GHOST %s %s" % (config.irc_pseudo, config.irc_password))
         serv.privmsg("NickServ", "RELEASE %s %s" % (config.irc_pseudo, config.irc_password))
         time.sleep(0.3)
         serv.nick(config.irc_pseudo)
@@ -122,10 +123,15 @@ class Parrot(ircbot.SingleServerIRCBot):
         quit_message = random.choice(config.quit_messages)
         self.die(msg=quit_message.encode("utf8"))
     
+    def reload_quotes(self):
+        """ Recharge la base de données des quotes et recompile la regexp de quote """
+        self.quotedb.load()
+        self.quote_pattern = re.compile(config.quote_regexp, flags=re.UNICODE)
+
     def execute_reload(self, auteur=None):
         """Recharge la config."""
         reload(config)
-        isit.regexp_compile()
+        self.reload_quotes()
         if auteur in [None, "SIGHUP"]:
             towrite = "Config reloaded" + " (SIGHUP received)" * (auteur == "SIGHUP")
             for to in config.report_bugs_to:
@@ -508,7 +514,7 @@ def main():
             parrot.start_as_daemon(outfile)
         else:
             # on enregistre le pid de parrot
-            pidfile = "/var/run/bots/parror.pid"
+            pidfile = "/var/run/bots/parrot.pid"
             for arg in sys.argv:
                 arg = arg.split("=")
                 if arg[0].strip('-') in ["pidfile"]: