From c2cca276bdbc9d59354a3597e231a2327580dc11 Mon Sep 17 00:00:00 2001 From: kzndotsh Date: Thu, 22 Aug 2024 02:56:33 +0000 Subject: [PATCH] refactor(cases.py): simplify target conversion by using UserConverter only fix(cases.py): use ctx.author for moderator assignment to avoid unnecessary conversion feat(cases.py): add check for moderator type to ensure it's a discord.Member, convert if not --- tux/cogs/moderation/cases.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tux/cogs/moderation/cases.py b/tux/cogs/moderation/cases.py index 3b831b1..eba325c 100644 --- a/tux/cogs/moderation/cases.py +++ b/tux/cogs/moderation/cases.py @@ -150,10 +150,7 @@ class Cases(ModerationCogBase): await ctx.send("Case not found.", delete_after=30) return - target = await commands.MemberConverter().convert( - ctx, - str(case.case_target_id), - ) or await commands.UserConverter().convert(ctx, str(case.case_target_id)) + target = await commands.UserConverter().convert(ctx, str(case.case_target_id)) await self._handle_case_response(ctx, case, "viewed", case.case_reason, target) @@ -233,10 +230,7 @@ class Cases(ModerationCogBase): await ctx.send("Failed to update case.", delete_after=30, ephemeral=True) return - target = await commands.MemberConverter().convert( - ctx, - str(case.case_target_id), - ) or await commands.UserConverter().convert(ctx, str(case.case_target_id)) + target = await commands.UserConverter().convert(ctx, str(case.case_target_id)) await self._handle_case_response(ctx, updated_case, "updated", updated_case.case_reason, target) @@ -266,10 +260,10 @@ class Cases(ModerationCogBase): """ if case is not None: - moderator = await commands.MemberConverter().convert( - ctx, - str(case.case_moderator_id), - ) or await commands.UserConverter().convert(ctx, str(case.case_moderator_id)) + moderator = ctx.author + + if not isinstance(moderator, discord.Member): + moderator = await commands.MemberConverter().convert(ctx, str(case.case_moderator_id)) fields = self._create_case_fields(moderator, target, reason)