Changement d'ops

[bots/parrot.git] / parrot.py

diff --git a/parrot.py b/parrot.py
index e9f4637b626d1d20a99fa6618f6afa095ba948c0..5b766d09a108659dff26dbc2aaa1727a69c25f77 100755 (executable)
--- a/parrot.py
+++ b/parrot.py
@@ -97,8 +97,7 @@ class Parrot(ircbot.SingleServerIRCBot):
     
     def give_me_my_pseudo(self, serv):
         """Récupère le pseudo auprès de NickServ."""
-        serv.privmsg("NickServ", "GHOST %s %s" % (config.irc_pseudo, config.irc_password))
-        serv.privmsg("NickServ", "RELEASE %s %s" % (config.irc_pseudo, config.irc_password))
+        serv.privmsg("NickServ", "RECOVER %s %s" % (config.irc_pseudo, config.irc_password))
         time.sleep(0.3)
         serv.nick(config.irc_pseudo)
     
@@ -481,6 +480,11 @@ class Parrot(ircbot.SingleServerIRCBot):
                 regexp = cmd in ["search" + suffix for suffix in config.regex_suffixes]
                 search = u" ".join(words[1:])
                 quotes = self.quotedb.search(inquote=search, regexp=regexp)
+                # On recherche également sur le contexte si on est en !context-search
+                if show_context:
+                    quotes += self.quotedb.search(place=search, regexp=regexp)
+                    # Pour pas biaiser le choix aléatoire, on enlève les doublons
+                    quotes = list(set(quotes))
                 if quotes:
                     q = random.choice(quotes)
                     serv.privmsg(canal, q.display(show_context))