X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=parrot.py;h=0cd5be9771eb644ee7ef2332b9330f1b8550d525;hb=e16477da6ca556666492b839f5a79ec84c41018d;hp=4ee3b23a6692399a93c3258ffa15aa7b3141628b;hpb=5dc10fbec825b8bd297a6cf6f3065242963968f0;p=bots%2Fparrot.git diff --git a/parrot.py b/parrot.py index 4ee3b23..0cd5be9 100755 --- a/parrot.py +++ b/parrot.py @@ -26,7 +26,8 @@ import errors #: Module de gestion des quotes import quotes -quote_pattern = re.compile(config.quote_regexp) +# Je veux pouvoir éditer ce que crée ce bot +os.umask(002) def get_config_logfile(serveur): """Renvoie le nom du fichier de log en fonction du ``serveur`` et de la config.""" @@ -85,7 +86,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 +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", "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 +124,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: @@ -155,11 +162,27 @@ class Parrot(ircbot.SingleServerIRCBot): self.serv.privmsg(place, message) log(self.serveur, place, auteur, something + "%r" % params + ("[successful]" if success else "[failed]")) - ### Gestion des quotes - def enregistrer(self, author, content, timestamp): - - quotes.save(self.quotelist, config.quote_file) + def acknowledge(self, asked_by, asked_where, message): + """Répond quelque chose au demandeur d'une action. + ``asked_where=None`` signifie en privé.""" + if asked_where is None: + self.serv.privmsg(asked_by, message) + else: + self.serv.privmsg(asked_where, "%s: %s" % (asked_by, message)) + + def dump(self, asked_by, asked_where=None): + """Dumpe les quotes. ``asked_where=None`` signifie en privé.""" + quotes.dump(self.quotedb) + self.acknowledge(asked_by, asked_where, "Quotes dumpées") + + def restore(self, asked_by, asked_where=None): + """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): @@ -343,6 +366,10 @@ class Parrot(ircbot.SingleServerIRCBot): serv.privmsg(auteur, " ".join(self.overops)) else: notunderstood = True + elif cmd == u"dump" and auteur in self.ops: + self.dump(asked_by=auteur) + elif cmd == u"restore" and auteur in self.overops: + self.restore(asked_by=auteur) else: notunderstood = True if notunderstood: @@ -394,12 +421,20 @@ class Parrot(ircbot.SingleServerIRCBot): elif cmd in [u"ping"] and not canal in self.quiet_channels: serv.privmsg(canal, "%s: pong" % (auteur)) + elif cmd in [u"dump"]: + self.dump(asked_by=auteur, asked_where=canal) + elif cmd in [u"restore"] and auteur in self.overops: + self.restore(asked_by=auteur, asked_where=canal) + elif cmd in [u"display"]: + self.serv.privmsg(canal, "%s: %s" % (auteur, config.quote_display_url.encode("utf-8"))) else: # Vu que ce bot est prévu pour parser des quotes il va falloir bosser ici - match = quote_pattern.match(message) + 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: @@ -416,6 +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") or message.startswith(u"!from"): + words = message.split() + cmd = words[0].lstrip("!") + regexp = any([cmd.endswith(suffix) for suffix in config.regex_suffixes]) + search = u" ".join(words[1:]) + authors = self.quotedb.search_authors(search, regexp) + 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.""" @@ -439,7 +502,7 @@ class Parrot(ircbot.SingleServerIRCBot): victime = ev.arguments()[0] raison = ev.arguments()[1] if victime == self.nick: - log(self.serveur, u"%s kické de %s par %s (raison : %s)" % (victime, channel.decode("utf-8"), auteur, raison)) + log(self.serveur, "%s kické de %s par %s (raison : %s)" % (victime, channel, auteur, raison)) time.sleep(2) serv.join(channel) @@ -508,7 +571,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"]: