From b92d239cd526d7e389f51d7290a04e262d5e9d51 Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.haland@gmail.com>
Date: Sat, 22 Jun 2019 16:42:56 +0200
Subject: Adding user-event-announcements to the spamfilter whitelist

---
 config-default.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config-default.yml b/config-default.yml
index 15a897fa4..af0621ece 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -115,6 +115,7 @@ guild:
         staff_lounge:      &STAFF_LOUNGE  464905259261755392
         talent_pool:       &TALENT_POOL   534321732593647616
         userlog:                          528976905546760203
+        user_event_a:      &USER_EVENT_A  592000283102674944
         verification:                     352442727016693763
 
     ignored: [*ADMINS, *MESSAGE_LOG, *MODLOG]
@@ -210,6 +211,7 @@ filter:
         - *STAFF_LOUNGE
         - *DEVTEST
         - *TALENT_POOL
+        - *USER_EVENT_A
 
     role_whitelist:
         - *ADMIN_ROLE
-- 
cgit v1.2.3


From f27c643131ce0a306cf6ecc51d81a4c0c38e418e Mon Sep 17 00:00:00 2001
From: Joseph Banks <joseph@josephbanks.me>
Date: Sat, 22 Jun 2019 16:50:55 +0100
Subject: add user events announcements to the constants.py class

---
 bot/constants.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/constants.py b/bot/constants.py
index d2c953276..17e60a418 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -352,6 +352,7 @@ class Channels(metaclass=YAMLGetter):
     reddit: int
     talent_pool: int
     userlog: int
+    user_event_a: int
     verification: int
 
 
-- 
cgit v1.2.3


From fe9482cd9d8bf4b34f1f5d3926695e2d1d5c1e8a Mon Sep 17 00:00:00 2001
From: Joseph Banks <joseph@josephbanks.me>
Date: Sat, 22 Jun 2019 17:00:39 +0100
Subject: Anti-spam should use the same whitelist as Filters

---
 bot/cogs/antispam.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/bot/cogs/antispam.py b/bot/cogs/antispam.py
index 9962fe1c2..03551e806 100644
--- a/bot/cogs/antispam.py
+++ b/bot/cogs/antispam.py
@@ -10,7 +10,7 @@ from bot.cogs.moderation import Moderation
 from bot.cogs.modlog import ModLog
 from bot.constants import (
     AntiSpam as AntiSpamConfig, Channels,
-    Colours, DEBUG_MODE, Event,
+    Colours, DEBUG_MODE, Event, Filter,
     Guild as GuildConfig, Icons,
     Roles, STAFF_ROLES,
 )
@@ -30,11 +30,6 @@ RULE_FUNCTION_MAPPING = {
     'newlines': rules.apply_newlines,
     'role_mentions': rules.apply_role_mentions
 }
-WHITELISTED_CHANNELS = (
-    Channels.admins, Channels.announcements, Channels.big_brother_logs,
-    Channels.devlog, Channels.devtest, Channels.helpers, Channels.message_log,
-    Channels.mod_alerts, Channels.modlog, Channels.staff_lounge
-)
 
 
 class AntiSpam:
@@ -55,7 +50,7 @@ class AntiSpam:
             not message.guild
             or message.guild.id != GuildConfig.id
             or message.author.bot
-            or (message.channel.id in WHITELISTED_CHANNELS and not DEBUG_MODE)
+            or (message.channel.id in Filter.channel_whitelist and not DEBUG_MODE)
             or (any(role.id in STAFF_ROLES for role in message.author.roles) and not DEBUG_MODE)
         ):
             return
-- 
cgit v1.2.3