!context-search recherche aussi dans les contextes

[bots/parrot.git] / parrot.py

diff --git a/parrot.py b/parrot.py
index e9f4637b626d1d20a99fa6618f6afa095ba948c0..955f3f7307399c725b33a397c75b4c097bbd517e 100755 (executable)
--- a/parrot.py
+++ b/parrot.py
@@ -481,6 +481,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))