From 16afa8d6cfa7ff70d73639ea3665bb47c5814586 Mon Sep 17 00:00:00 2001 From: SebastiaanZ <33516116+SebastiaanZ@users.noreply.github.com> Date: Mon, 7 Jan 2019 20:44:00 +0100 Subject: Removing orphaned comment and restructuring user notification for filter_rich_embed --- bot/cogs/filtering.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bot/cogs/filtering.py b/bot/cogs/filtering.py index 5c6ed9c26..42424cd05 100644 --- a/bot/cogs/filtering.py +++ b/bot/cogs/filtering.py @@ -82,8 +82,8 @@ class Filtering: "notification_msg": ( "Your post has been removed because it contained a rich embed. " "This indicates that you're either using an unofficial discord client or are using a self-bot, " - "both of which violate Discord's Terms of Service.\n\n" - f"Please don't use a self-bot or an unofficial Discord client on our server. {_staff_mistake_str}" + f"both of which violate Discord's Terms of Service. {_staff_mistake_str}\n\n" + "Please don't use a self-bot or an unofficial Discord client on our server." ) }, "watch_words": { @@ -140,7 +140,6 @@ class Filtering: if filter_message: for filter_name, _filter in self.filters.items(): - # Is this specific filter enabled in the config? if _filter["enabled"]: # Does the filter only need the message content or the full message? @@ -199,7 +198,6 @@ class Filtering: additional_embeds=additional_embeds, ) - # If filtering rich embeds, also send the removed embeds to mod_alerts break # We don't want multiple filters to trigger @staticmethod -- cgit v1.2.3