diff options
| author |  Bast <[email protected]> | 2021-06-22 03:26:55 -0700 |
|---|---|---|
| committer | Bast <[email protected]> | 2021-06-22 03:26:55 -0700 |
| commit | 7294943d307d8c58b2b37214c186872d6be24162 (patch) | |
| tree | 71fff9a492acd29ca883d70a73f16fb58ed98143 | |
| parent | Merge pull request #1648 from python-discord/voice-verify-pings (diff) | |
Reorder everyone ping filter so it fires after watch_regex
This means messages with both @everyone and a watched term ping the mod team instead of hiding beneath the everyone ping silent alert
| -rw-r--r-- | bot/exts/filters/filtering.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/bot/exts/filters/filtering.py b/bot/exts/filters/filtering.py index 464732453..661d6c9a2 100644 --- a/bot/exts/filters/filtering.py +++ b/bot/exts/filters/filtering.py @@ -103,19 +103,6 @@ class Filtering(Cog): ), "schedule_deletion": False }, - "filter_everyone_ping": { - "enabled": Filter.filter_everyone_ping, - "function": self._has_everyone_ping, - "type": "filter", - "content_only": True, - "user_notification": Filter.notify_user_everyone_ping, - "notification_msg": ( - "Please don't try to ping `@everyone` or `@here`. " - f"Your message has been removed. {staff_mistake_str}" - ), - "schedule_deletion": False, - "ping_everyone": False - }, "watch_regex": { "enabled": Filter.watch_regex, "function": self._has_watch_regex_match, @@ -129,7 +116,20 @@ class Filtering(Cog): "type": "watchlist", "content_only": False, "schedule_deletion": False - } + }, + "filter_everyone_ping": { + "enabled": Filter.filter_everyone_ping, + "function": self._has_everyone_ping, + "type": "filter", + "content_only": True, + "user_notification": Filter.notify_user_everyone_ping, + "notification_msg": ( + "Please don't try to ping `@everyone` or `@here`. " + f"Your message has been removed. {staff_mistake_str}" + ), + "schedule_deletion": False, + "ping_everyone": False + }, } self.bot.loop.create_task(self.reschedule_offensive_msg_deletion()) |