From 2325a9e880bf6568ea5d9345a6a2b3d861e2e976 Mon Sep 17 00:00:00 2001 From: L3viathan Date: Fri, 13 Nov 2026 13:54:12 +0100 Subject: [PATCH] Remove references to old modmail categories --- bot/constants.py | 8 +------- bot/exts/info/stats.py | 5 +---- bot/exts/moderation/infraction/_utils.py | 5 +---- bot/exts/moderation/infraction/management.py | 5 +---- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/bot/constants.py b/bot/constants.py index 28fa4fc4dd..c5ab1acb22 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -184,10 +184,7 @@ class _Categories(EnvConfig, env_prefix="categories_"): logs: int = 468520609152892958 moderators: int = 749736277464842262 - modmail: int = 714494672835444826 - new_modmail: int = 1533613940318146702 - appeals: int = 890331800025563216 - appeals_2: int = 895417395261341766 + modmail: int = 1533613940318146702 voice: int = 356013253765234688 # 2021 Summer Code Jam @@ -207,10 +204,7 @@ class _Guild(EnvConfig, env_prefix="guild_"): moderation_categories: tuple[int, ...] = ( Categories.moderators, Categories.modmail, - Categories.new_modmail, Categories.logs, - Categories.appeals, - Categories.appeals_2 ) moderation_channels: tuple[int, ...] = (Channels.admins, Channels.admin_spam, Channels.mods) modlog_blacklist: tuple[int, ...] = ( diff --git a/bot/exts/info/stats.py b/bot/exts/info/stats.py index 1a4ad0408e..af7663c282 100644 --- a/bot/exts/info/stats.py +++ b/bot/exts/info/stats.py @@ -35,10 +35,7 @@ async def on_message(self, message: Message) -> None: if message.guild.id != Guild.id: return - if ( - is_in_category(message.channel, Categories.modmail) - or is_in_category(message.channel, Categories.new_modmail) - ): + if is_in_category(message.channel, Categories.modmail): if message.channel.id != Channels.incidents: # Do not report modmail channels to stats, there are too many # of them for interesting statistics to be drawn out of this. diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py index e8f10043c9..a650bb7e35 100644 --- a/bot/exts/moderation/infraction/_utils.py +++ b/bot/exts/moderation/infraction/_utils.py @@ -140,10 +140,7 @@ async def post_infraction( current_time = arrow.utcnow() - if any( - is_in_category(ctx.channel, category) - for category in (Categories.modmail, Categories.appeals, Categories.appeals_2) - ): + if is_in_category(ctx.channel, Categories.modmail): jump_url = None else: jump_url = await get_invocation_jump_url(ctx) diff --git a/bot/exts/moderation/infraction/management.py b/bot/exts/moderation/infraction/management.py index 176909eaa2..a83ef60556 100644 --- a/bot/exts/moderation/infraction/management.py +++ b/bot/exts/moderation/infraction/management.py @@ -300,10 +300,7 @@ async def infraction_edit( user_text = f"<@{user_id}>" thumbnail = None - if any( - is_in_category(ctx.channel, category) - for category in (Categories.modmail, Categories.appeals, Categories.appeals_2) - ): + if is_in_category(ctx.channel, Categories.modmail): jump_url = "(Infraction edited in a ModMail channel.)" else: # `ctx.send` may be replaced with a no-op (e.g. by cleanban), so don't use the confirmation message.