Merge branch 'master' into text-link-fix

jackee233 · Sep 5, 2020 · a4ab2c4 · a4ab2c4
2 parents d2e7dd3 + 53cb77b
commit a4ab2c4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/bot/cogs/antispam.py b/bot/cogs/antispam.py
@@ -27,15 +27,18 @@
 RULE_FUNCTION_MAPPING = {
     'attachments': rules.apply_attachments,
     'burst': rules.apply_burst,
-    'burst_shared': rules.apply_burst_shared,
+    # burst shared is temporarily disabled due to a bug
+    # 'burst_shared': rules.apply_burst_shared,
     'chars': rules.apply_chars,
     'discord_emojis': rules.apply_discord_emojis,
     'duplicates': rules.apply_duplicates,
     'links': rules.apply_links,
     'mentions': rules.apply_mentions,
     'newlines': rules.apply_newlines,
     'role_mentions': rules.apply_role_mentions,
-    'everyone_ping': rules.apply_everyone_ping,
+    # the everyone filter is temporarily disabled until
+    # it has been improved.
+    # 'everyone_ping': rules.apply_everyone_ping,
 }
 
 

diff --git a/config-default.yml b/config-default.yml
@@ -352,9 +352,13 @@ anti_spam:
             interval: 10
             max: 7
 
-        burst_shared:
-            interval: 10
-            max: 20
+        # Burst shared it (temporarily) disabled to prevent
+        # the bug that triggers multiple infractions/DMs per
+        # user. It also tends to catch a lot of innocent users
+        # now that we're so big.
+        # burst_shared:
+        #    interval: 10
+        #    max: 20
 
         chars:
             interval: 5
@@ -385,9 +389,11 @@ anti_spam:
             interval: 10
             max: 3
 
-        everyone_ping:
-            interval: 10
-            max: 0
+        # The everyone ping filter is temporarily disabled
+        # until we've fixed a couple of bugs.
+        # everyone_ping:
+        #    interval: 10
+        #    max: 0
 
 
 reddit: