Triggers on "allah is doing"

diff --git a/config.py b/config.py
index d9e3007480930bcf4fe4067a84b32d31372735b5..056b5c92ca0df0c363fa182cdfffbfe8cdfcdef4 100644 (file)
--- a/config.py
+++ b/config.py
@@ -44,7 +44,7 @@ leave_fail_messages = quit_fail_messages
 pas_programme_pour_tobeir = [u"Encore eût-il fallu que je fusse programmé pour vous obéir !"]
 
 #: Allah regexp
-allah_triggers = [".*is not doing allah is doing"]
+allah_triggers = ["is not doing allah is doing"]
 
 #: Aide sur les commandes
 helpdico = {

diff --git a/isit.py b/isit.py
index 07c81dc1ab26ef63f23d5db9c2d4aba44fe8e41f..ac1da5deb5e1270845174ed37a0242a0e727dab4 100644 (file)
--- a/isit.py
+++ b/isit.py
@@ -40,3 +40,7 @@ regexp_compile()
 def is_tag(chain):
     """Vérifie si ``chain`` demande de fermer sa gueule."""
     return is_something(chain, config.tag_regexp_compiled)
+
+def is_allah(chain):
+    """Vérifie si ``chain``est du allah-spam."""
+    return is_something(chain, config.allah_regexp_compiled)

diff --git a/josh.py b/josh.py
index e4c4da126016b8fb54533c70f6eff9287bd0c681..98fc4a07e634e2a8d8bdf9566ac7285ef8f6307b 100755 (executable)
--- a/josh.py
+++ b/josh.py
@@ -398,6 +398,8 @@ class Josh(ircbot.SingleServerIRCBot):
                     answer = random.choice(config.tag_answers)
                     for ligne in answer.split("\n"):
                         serv.privmsg(canal, "%s: %s" % (auteur, ligne.encode("utf8")))
+        if isit.is_allah(message):
+            serv.kick(canal, auteur, u"Please go spread your proselytism somewhere else.")
 
     def on_action(self, serv, ev):
         """À la réception d'une action."""