diff options
| author |  Sebastiaan Zeeff <[email protected]> | 2020-10-17 10:33:31 +0200 |
|---|---|---|
| committer | Sebastiaan Zeeff <[email protected]> | 2020-10-17 10:33:31 +0200 |
| commit | f8e7b3f82244ff33cd8c8a960d7c6e734b87afd6 (patch) | |
| tree | c7d42441bf9a44360b0ae5036923dd00b0b96522 | |
| parent | Add sprinters role to filter whitelist (diff) | |
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 <[email protected]>
| -rw-r--r-- | bot/exts/filters/antimalware.py | 4 | ||||
| -rw-r--r-- | 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 |