From ba1b0effdf67b53a26d09410a9b2bb2d122be60b Mon Sep 17 00:00:00 2001 From: Slipstream Date: Mon, 26 May 2025 22:07:13 -0600 Subject: [PATCH] fix: Correct mention usage in response messages for roleplay commands --- cogs/neru_message_cog.py | 2 +- error_handler.py | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cogs/neru_message_cog.py b/cogs/neru_message_cog.py index 4530850..ed79608 100644 --- a/cogs/neru_message_cog.py +++ b/cogs/neru_message_cog.py @@ -197,7 +197,7 @@ class MessageCog(commands.Cog): f"{interaction.user.mention} showed no mercy as they violated {member.mention}.", f"{member.mention} was utterly helpless against {interaction.user.mention}'s assault.", f"{interaction.user.mention} reveled in {member.mention}'s pain and fear.", - f"{member.user.mention} was broken by {interaction.user.mention}'s actions.", + f"{member.mention} was broken by {interaction.user.mention}'s actions.", f"{interaction.user.mention} took {member.mention}'s innocence by force.", f"{member.mention} was scarred for life by {interaction.user.mention}'s brutality.", f"{interaction.user.mention} left {member.mention} a shell of their former self.", diff --git a/error_handler.py b/error_handler.py index a174c00..78df6dc 100644 --- a/error_handler.py +++ b/error_handler.py @@ -157,7 +157,10 @@ def log_error_details(ctx_or_interaction, error, content=None): if hasattr(ctx_or_interaction, 'guild') and ctx_or_interaction.guild: f.write(f" Guild: {ctx_or_interaction.guild.name} (ID: {ctx_or_interaction.guild.id})\n") if hasattr(ctx_or_interaction, 'channel') and ctx_or_interaction.channel: - f.write(f" Channel: {ctx_or_interaction.channel.name} (ID: {ctx_or_interaction.channel.id})\n") + channel_name = ctx_or_interaction.channel.name + if isinstance(ctx_or_interaction.channel, discord.DMChannel): + channel_name = f"DM with {ctx_or_interaction.channel.recipient.name}" if ctx_or_interaction.channel.recipient else "DM Channel" + f.write(f" Channel: {channel_name} (ID: {ctx_or_interaction.channel.id})\n") else: f.write(f" Type: Interaction\n") if hasattr(ctx_or_interaction, 'user') and ctx_or_interaction.user: @@ -165,7 +168,10 @@ def log_error_details(ctx_or_interaction, error, content=None): if hasattr(ctx_or_interaction, 'guild') and ctx_or_interaction.guild: f.write(f" Guild: {ctx_or_interaction.guild.name} (ID: {ctx_or_interaction.guild.id})\n") if hasattr(ctx_or_interaction, 'channel') and ctx_or_interaction.channel: - f.write(f" Channel: {ctx_or_interaction.channel.name} (ID: {ctx_or_interaction.channel.id})\n") + channel_name = ctx_or_interaction.channel.name + if isinstance(ctx_or_interaction.channel, discord.DMChannel): + channel_name = f"DM with {ctx_or_interaction.channel.recipient.name}" if ctx_or_interaction.channel.recipient else "DM Channel" + f.write(f" Channel: {channel_name} (ID: {ctx_or_interaction.channel.id})\n") if hasattr(ctx_or_interaction, 'command') and ctx_or_interaction.command: f.write(f" Command: {ctx_or_interaction.command.name}\n") f.write("\n") @@ -319,12 +325,18 @@ async def send_error_embed_to_owner(ctx_or_interaction, error): if ctx_or_interaction.guild: guild_info = f"{ctx_or_interaction.guild.name} (ID: {ctx_or_interaction.guild.id})" if ctx_or_interaction.channel: - channel_info = f"#{ctx_or_interaction.channel.name} (ID: {ctx_or_interaction.channel.id})" + if isinstance(ctx_or_interaction.channel, discord.DMChannel): + channel_info = f"DM with {ctx_or_interaction.channel.recipient.name}" if ctx_or_interaction.channel.recipient else "DM Channel" + else: + channel_info = f"#{ctx_or_interaction.channel.name} (ID: {ctx_or_interaction.channel.id})" else: # It's an interaction if ctx_or_interaction.guild: guild_info = f"{ctx_or_interaction.guild.name} (ID: {ctx_or_interaction.guild.id})" if ctx_or_interaction.channel: - channel_info = f"#{ctx_or_interaction.channel.name} (ID: {ctx_or_interaction.channel.id})" + if isinstance(ctx_or_interaction.channel, discord.DMChannel): + channel_info = f"DM with {ctx_or_interaction.channel.recipient.name}" if ctx_or_interaction.channel.recipient else "DM Channel" + else: + channel_info = f"#{ctx_or_interaction.channel.name} (ID: {ctx_or_interaction.channel.id})" embed.add_field( name="Server", @@ -688,4 +700,4 @@ async def handle_error(ctx_or_interaction, error): if ctx_or_interaction.user.id == user_id: await ctx_or_interaction.followup.send(content=error_message, ephemeral=True) else: - await ctx_or_interaction.followup.send("An error occurred while processing your command.", ephemeral=True) \ No newline at end of file + await ctx_or_interaction.followup.send("An error occurred while processing your command.", ephemeral=True)