From 29d370da244801040f128ad2dca9976c0c7ad61a Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
Date: Sat, 17 Oct 2020 10:30:13 +0200
Subject: Add sprinters role to filter whitelist

I've added the sprinters role to the filter whitelist. This will not
affect antispam and antimalware just yet, as they currently default to
using the STAFF_ROLES constant.

I've also kaizened the config-default.yml file by ensuring there are two
linebreaks between all sections.

Signed-off-by: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
---
 bot/constants.py   | 1 +
 config-default.yml | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/bot/constants.py b/bot/constants.py
index 6c8b933af..0a3e48616 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -456,6 +456,7 @@ class Roles(metaclass=YAMLGetter):
     owners: int
     partners: int
     python_community: int
+    sprinters: int
     team_leaders: int
     unverified: int
     verified: int  # This is the Developers role on PyDis, here named verified for readability reasons.
diff --git a/config-default.yml b/config-default.yml
index 0e7ebf2e3..c93ab9e0c 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -119,6 +119,7 @@ style:
         voice_state_green: "https://cdn.discordapp.com/emojis/656899770094452754.png"
         voice_state_red: "https://cdn.discordapp.com/emojis/656899769905709076.png"
 
+
 guild:
     id: 267624335836053506
     invite: "https://discord.gg/python"
@@ -225,6 +226,7 @@ guild:
         muted:              &MUTED_ROLE         277914926603829249
         partners:                               323426753857191936
         python_community:   &PY_COMMUNITY_ROLE  458226413825294336
+        sprinters:          &SPRINTERS          758422482289426471
 
         unverified:                             739794855945044069
         verified:                               352427296948486144  # @Developers on PyDis
@@ -261,6 +263,7 @@ guild:
         reddit:                             635408384794951680
         talent_pool:                        569145364800602132
 
+
 filter:
     # What do we filter?
     filter_zalgo:          false
@@ -298,6 +301,7 @@ filter:
         - *OWNERS_ROLE
         - *HELPERS_ROLE
         - *PY_COMMUNITY_ROLE
+        - *SPRINTERS
 
 
 keys:
@@ -326,6 +330,7 @@ urls:
     bot_avatar:      "https://raw.githubusercontent.com/discord-python/branding/master/logos/logo_circle/logo_circle.png"
     github_bot_repo: "https://github.com/python-discord/bot"
 
+
 anti_spam:
     # Clean messages that violate a rule.
     clean_offending: true
@@ -459,10 +464,12 @@ help_channels:
     notify_roles:
         - *HELPERS_ROLE
 
+
 redirect_output:
     delete_invocation: true
     delete_delay: 15
 
+
 duck_pond:
     threshold: 4
     channel_blacklist:
@@ -478,6 +485,7 @@ duck_pond:
         - *MOD_ANNOUNCEMENTS
         - *ADMIN_ANNOUNCEMENTS
 
+
 python_news:
     mail_lists:
         - 'python-ideas'
-- 
cgit v1.2.3


From f8e7b3f82244ff33cd8c8a960d7c6e734b87afd6 Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
Date: Sat, 17 Oct 2020 10:33:31 +0200
Subject: Use filter role whitelist for all filter features

We were using different whitelists for different filters, making it
slightly more difficult to maintain the role whitelists. They now all
use the same list, which combines our staff roles with the Python
community role and the sprinters role.

Signed-off-by: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
---
 bot/exts/filters/antimalware.py | 4 ++--
 bot/exts/filters/antispam.py    | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bot/exts/filters/antimalware.py b/bot/exts/filters/antimalware.py
index 7894ec48f..26f00e91f 100644
--- a/bot/exts/filters/antimalware.py
+++ b/bot/exts/filters/antimalware.py
@@ -6,7 +6,7 @@ from discord import Embed, Message, NotFound
 from discord.ext.commands import Cog
 
 from bot.bot import Bot
-from bot.constants import Channels, STAFF_ROLES, URLs
+from bot.constants import Channels, Filter, URLs
 
 log = logging.getLogger(__name__)
 
@@ -61,7 +61,7 @@ class AntiMalware(Cog):
 
         # Check if user is staff, if is, return
         # Since we only care that roles exist to iterate over, check for the attr rather than a User/Member instance
-        if hasattr(message.author, "roles") and any(role.id in STAFF_ROLES for role in message.author.roles):
+        if hasattr(message.author, "roles") and any(role.id in Filter.role_whitelist for role in message.author.roles):
             return
 
         embed = Embed()
diff --git a/bot/exts/filters/antispam.py b/bot/exts/filters/antispam.py
index 4964283f1..af8528a68 100644
--- a/bot/exts/filters/antispam.py
+++ b/bot/exts/filters/antispam.py
@@ -15,7 +15,6 @@ from bot.constants import (
     AntiSpam as AntiSpamConfig, Channels,
     Colours, DEBUG_MODE, Event, Filter,
     Guild as GuildConfig, Icons,
-    STAFF_ROLES,
 )
 from bot.converters import Duration
 from bot.exts.moderation.modlog import ModLog
@@ -149,7 +148,7 @@ class AntiSpam(Cog):
             or message.guild.id != GuildConfig.id
             or message.author.bot
             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)
+            or (any(role.id in Filter.role_whitelist for role in message.author.roles) and not DEBUG_MODE)
         ):
             return
 
-- 
cgit v1.2.3