X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=parrot.py;h=0cd5be9771eb644ee7ef2332b9330f1b8550d525;hb=e16477da6ca556666492b839f5a79ec84c41018d;hp=aae04fc037e198f702e24d1d6c175d2a31f3f9d8;hpb=e40da5a33f6a26bc6524bad637483db3fe602cd1;p=bots%2Fparrot.git

diff --git a/parrot.py b/parrot.py
index aae04fc..0cd5be9 100755
--- a/parrot.py
+++ b/parrot.py
@@ -180,6 +180,9 @@ class Parrot(ircbot.SingleServerIRCBot):
         """Restaure les quotes à partir du dump.  ``asked_where=None`` signifie en privé."""
         self.quotedb = quotes.restore()
         self.acknowledge(asked_by, asked_where, "Quotes restaurées à partir du dump (pas de backup effectué).")
+        many = self.quotedb.get_clash_authors()
+        if many:
+            self.acknowledge(asked_by, asked_where, "Auteurs de casse différente : %s" % (many))
     
     ### Surcharge des events du Bot
     def on_welcome(self, serv, ev):
@@ -429,7 +432,9 @@ class Parrot(ircbot.SingleServerIRCBot):
             match = self.quote_pattern.match(message)
             if match:
                 d = match.groupdict()
-                if self.quotedb.store(d["author"], d["content"]):
+                # On n'autorise pas les gens à déclarer le quoter
+                d["quoter"] = auteur.decode("utf-8")
+                if self.quotedb.store(**d):
                     serv.privmsg(canal, (u"%s: Ce sera retenu, répété, amplifié" % (auteur,)).encode("utf-8"))
                     self.quotedb.save()
                 else:
@@ -446,15 +451,34 @@ class Parrot(ircbot.SingleServerIRCBot):
                         serv.privmsg(canal, (u"Pas de quote de %s en mémoire." % author).encode("utf-8"))
                         return
                     serv.privmsg(canal, str(q))
-            elif message.startswith(u"!author"):
+            elif message.startswith(u"!author") or message.startswith(u"!from"):
                 words = message.split()
                 cmd = words[0].lstrip("!")
-                regexp = cmd in ["author-r", "authorreg", "author-reg", "author-regex"]
+                regexp = any([cmd.endswith(suffix) for suffix in config.regex_suffixes])
                 search = u" ".join(words[1:])
                 authors = self.quotedb.search_authors(search, regexp)
-                if len(authors) > config.search_max_authors:
-                    authors = authors[:config.search_max_authors+1] + [unicode(len(authors) - config.search_max_authors)]
-                serv.privmsg(canal, "%s: %s" % (auteur, (u" ".join(authors)).encode("utf-8")))
+                if not authors:
+                    serv.privmsg(canal, "%s: Pas d'auteur correspondant à la recherche." % (auteur,))
+                    return
+                if cmd.startswith("author"):
+                    if len(authors) > config.search_max_authors:
+                        authors = authors[:config.search_max_authors+1] + ["+%s" % (len(authors) - config.search_max_authors)]
+                    serv.privmsg(canal, "%s: %s" % (auteur, (u", ".join(authors)).encode("utf-8")))
+                elif cmd.startswith("from"):
+                    quotes = sum([self.quotedb.quotesfrom(a) for a in authors], [])
+                    q = random.choice(quotes)
+                    serv.privmsg(canal, str(q))
+            elif message.startswith(u"!search"):
+                words = message.split()
+                cmd = words[0].lstrip("!")
+                regexp = cmd in ["search" + suffix for suffix in config.regex_suffixes]
+                search = u" ".join(words[1:])
+                quotes = self.quotedb.search(inquote=search, regexp=regexp)
+                if quotes:
+                    q = random.choice(quotes)
+                    serv.privmsg(canal, str(q))
+                else:
+                    serv.privmsg(canal, "%s: Pas de quotes correspondant à la recherche." % (auteur,))
 
     def on_action(self, serv, ev):
         """À la réception d'une action."""