aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar S. Co1 <[email protected]>2019-10-25 08:57:55 -0400
committerGravatar GitHub <[email protected]>2019-10-25 08:57:55 -0400
commiteb6240157aaf5825fcd92c1a7ba3ef7618ceeb7d (patch)
tree5b38dbac8d2ee5071eff9ab9156f5353ce71e446
parentMerge pull request #529 from python-discord/show-trigger-word (diff)
parentMerge branch 'master' into ###-filtering-devtest (diff)
Merge pull request #550 from python-discord/###-filtering-devtest
Use standard filter conditions even if DEBUG_MODE is on.
-rw-r--r--bot/cogs/filtering.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/bot/cogs/filtering.py b/bot/cogs/filtering.py
index 772c5dbb2..be9b95bc7 100644
--- a/bot/cogs/filtering.py
+++ b/bot/cogs/filtering.py
@@ -9,7 +9,7 @@ from discord.ext.commands import Bot, Cog
from bot.cogs.moderation import ModLog
from bot.constants import (
- Channels, Colours, DEBUG_MODE,
+ Channels, Colours,
Filter, Icons, URLs
)
@@ -136,10 +136,6 @@ class Filtering(Cog):
and not msg.author.bot # Author not a bot
)
- # If we're running the bot locally, ignore role whitelist and only listen to #dev-test
- if DEBUG_MODE:
- filter_message = not msg.author.bot and msg.channel.id == Channels.devtest
-
# If none of the above, we can start filtering.
if filter_message:
for filter_name, _filter in self.filters.items():