aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Leon Sandøy <[email protected]>2018-07-30 22:43:54 +0200
committerGravatar Leon Sandøy <[email protected]>2018-07-30 22:43:54 +0200
commite27ff90075d59f9f1797501551159027ff353ba6 (patch)
tree9e44a58e4958d73b741a19dfc1767d014f50ae11
parentGotta filter edits too, to combat sneaky racists (diff)
Sanity check for msg.author. Only Member has roles.
-rw-r--r--bot/cogs/filtering.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/bot/cogs/filtering.py b/bot/cogs/filtering.py
index 92fa13f5b..89735e57c 100644
--- a/bot/cogs/filtering.py
+++ b/bot/cogs/filtering.py
@@ -1,7 +1,7 @@
import logging
import re
-from discord import Colour, Message
+from discord import Colour, Member, Message
from discord.ext.commands import Bot
from bot.cogs.modlog import ModLog
@@ -83,9 +83,11 @@ class Filtering:
# Should we filter this message?
role_whitelisted = False
- for role in msg.author.roles:
- if role.id in Filter.role_whitelist:
- role_whitelisted = True
+
+ if type(msg.author) is Member: # Only Member has roles, not User.
+ for role in msg.author.roles:
+ if role.id in Filter.role_whitelist:
+ role_whitelisted = True
filter_message = (
msg.channel.id not in Filter.channel_whitelist # Channel not in whitelist