From c55b7e3749166d06f66193692a7ded5d1317a154 Mon Sep 17 00:00:00 2001
From: MrAwesomeRocks <42477863+MrAwesomeRocks@users.noreply.github.com>
Date: Fri, 28 Aug 2020 20:21:01 -0500
Subject: Everyone Ping: Fixed rule, edited config

Changed the method of checking for an everyone ping.
Also changed the config to act as `min pings` instead
of `ping enabled/disabled`.
---
 bot/rules/everyone_ping.py | 16 ++++++----------
 config-default.yml         |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/bot/rules/everyone_ping.py b/bot/rules/everyone_ping.py
index 342727093..bfc400831 100644
--- a/bot/rules/everyone_ping.py
+++ b/bot/rules/everyone_ping.py
@@ -14,18 +14,14 @@ async def apply(
     )
 
     ev_msgs_ct = 0
-    if config["max"]:
-        for msg in relevant_messages:
-            ev_role = msg.guild.default_role
-            msg_roles = msg.role_mentions
+    for msg in relevant_messages:
+        if '@everyone' in msg.content:
+            ev_msgs_ct += 1
 
-            if ev_role in msg_roles:
-                ev_msgs_ct += 1
-
-    if ev_msgs_ct > 0:
+    if ev_msgs_ct >= config['max']:
         return (
-            f"pinged the everyone role {ev_msgs_ct} times",
-            (last_message.author),
+            f"pinged the everyone role {ev_msgs_ct} times in {config['interval']}s",
+            (last_message.author,),
             relevant_messages,
         )
     return None
diff --git a/config-default.yml b/config-default.yml
index 18d7f4b0e..8546b5310 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -386,8 +386,8 @@ anti_spam:
             max: 3
 
         everyone_ping:
-            interval: 1
-            max: 1
+            interval: 10
+            max: 0
 
 
 reddit:
-- 
cgit v1.2.3