diff options
| author |  ChrisJL <[email protected]> | 2021-06-26 00:27:42 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-06-26 00:27:42 +0100 |
| commit | 2d891813435df6be01a1878b1e1300831794c05e (patch) | |
| tree | a0927dfe4481fe5f9fcc0fb8c29c3848460312db | |
| parent | Merge pull request #1656 from python-discord/swfarnsworth/echo_permissions (diff) | |
| parent | Merge branch 'main' into fix-reorder-filter-priority (diff) | |
Merge pull request #1654 from bast0006/fix-reorder-filter-priority
Reorder everyone ping filter so it fires after watch_regex
| -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()) |