X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=historien.py;h=33b9af6aead17df74347160629a0ed2ed3736d7f;hb=602331d4815e721be1f8fcffa81391b3ba681a4b;hp=a550556a96bfd9bd52dd3ae14a2a7aba70bd5a87;hpb=dca643b9b7f70c82fbe899c6bfd4faea16b7e191;p=bots%2Fhistorien.git diff --git a/historien.py b/historien.py index a550556..33b9af6 100755 --- a/historien.py +++ b/historien.py @@ -51,6 +51,16 @@ def log(serveur,channel,auteur=None,message=None): print chain f.close() +def ignore_event(serv, ev): + """Retourne ``True`` si il faut ignorer cet évènement.""" + for (blackmask, exceptmask) in config.blacklisted_masks: + usermask = ev.source() + if exceptmask is None: + exceptit = False + else: + exceptit = bool(irclib.mask_matches(usermask, exceptmask)) + blackit = bool(irclib.mask_matches(usermask, blackmask)) + return blackit and not exceptit class GoodCentury(Exception): pass @@ -219,6 +229,8 @@ class Historien(ircbot.SingleServerIRCBot): return (False,message) def on_privmsg(self, serv, ev): + if ignore_event(serv, ev): + return message=ev.arguments()[0] auteur = irclib.nm_to_n(ev.source()) try: @@ -465,6 +477,8 @@ class Historien(ircbot.SingleServerIRCBot): serv.privmsg(auteur,"Je n'ai pas compris. Essaye HELP…") def on_pubmsg(self, serv, ev): + if ignore_event(serv, ev): + return auteur = irclib.nm_to_n(ev.source()) canal = ev.target() message = ev.arguments()[0] @@ -644,7 +658,7 @@ class Historien(ircbot.SingleServerIRCBot): return self.serv.get_nickname() nick = property(_getnick) - def update_activity(self,canal,pseudo,message): + def update_activity(self,canal="",pseudo="",message="",force=False): if force or (not pseudo in config.idle_bots and all([not re.match(ignore, message) for ignore in config.idle_messages])): self.last_activity[canal]=time.time() def is_active(self,canal):