From 907b10d466b5df16d6438c6735088c4d65cdf098 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Sun, 7 Mar 2021 22:53:56 +1000 Subject: [PATCH 1/4] Add msglink command to get DM message URLs. --- cogs/modmail.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cogs/modmail.py b/cogs/modmail.py index ee109420af..2392916fea 100644 --- a/cogs/modmail.py +++ b/cogs/modmail.py @@ -601,6 +601,18 @@ async def sfw(self, ctx): sent_emoji, _ = await self.bot.retrieve_emoji() await self.bot.add_reaction(ctx.message, sent_emoji) + @commands.command() + @checks.has_permissions(PermissionLevel.SUPPORTER) + @checks.thread_only() + async def loglink(self, ctx, message_id: int): + """Retrieves the link to a message in the current thread.""" + message = await ctx.thread.recipient.fetch_message(message_id) + if not message: + embed = discord.Embed(color=self.bot.main_color, description="Message no longer exists.") + else: + embed = discord.Embed(color=self.bot.main_color, description=message.jump_url) + await ctx.send(embed=embed) + @commands.command() @checks.has_permissions(PermissionLevel.SUPPORTER) @checks.thread_only() From 5482bed00fab2da73c1fae694271acd682967dca Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Sun, 7 Mar 2021 22:54:16 +1000 Subject: [PATCH 2/4] Add DM channel ID to genesis message footer. --- core/thread.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/thread.py b/core/thread.py index d534ef352e..98f67ca897 100644 --- a/core/thread.py +++ b/core/thread.py @@ -300,7 +300,11 @@ def _format_info_embed(self, user, log_url, log_count, color): # embed.add_field(name='Mention', value=user.mention) # embed.add_field(name='Registered', value=created + days(created)) - footer = "User ID: " + str(user.id) + if user.dm_channel: + footer = f"User ID: {user.id} • DM ID: {user.dm_channel}" + else: + footer = f"User ID: {user.id}" + embed.set_author(name=str(user), icon_url=user.avatar_url, url=log_url) # embed.set_thumbnail(url=avi) From 784aa4f950b2b6fe9e275860c03fa961ff1abd84 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Sun, 7 Mar 2021 23:07:54 +1000 Subject: [PATCH 3/4] Amend typo and black formatting. --- cogs/modmail.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cogs/modmail.py b/cogs/modmail.py index 2392916fea..d9965243be 100644 --- a/cogs/modmail.py +++ b/cogs/modmail.py @@ -604,11 +604,13 @@ async def sfw(self, ctx): @commands.command() @checks.has_permissions(PermissionLevel.SUPPORTER) @checks.thread_only() - async def loglink(self, ctx, message_id: int): + async def msglink(self, ctx, message_id: int): """Retrieves the link to a message in the current thread.""" message = await ctx.thread.recipient.fetch_message(message_id) if not message: - embed = discord.Embed(color=self.bot.main_color, description="Message no longer exists.") + embed = discord.Embed( + color=self.bot.main_color, description="Message no longer exists." + ) else: embed = discord.Embed(color=self.bot.main_color, description=message.jump_url) await ctx.send(embed=embed) From e0956c48061ed164af3ae3953589f9cba1e56cb7 Mon Sep 17 00:00:00 2001 From: Jia Rong Yee <28086837+fourjr@users.noreply.github.com> Date: Sun, 7 Mar 2021 23:11:20 +0800 Subject: [PATCH 4/4] Improve messages --- cogs/modmail.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cogs/modmail.py b/cogs/modmail.py index d9965243be..f0ee2815c8 100644 --- a/cogs/modmail.py +++ b/cogs/modmail.py @@ -606,13 +606,16 @@ async def sfw(self, ctx): @checks.thread_only() async def msglink(self, ctx, message_id: int): """Retrieves the link to a message in the current thread.""" - message = await ctx.thread.recipient.fetch_message(message_id) - if not message: + try: + message = await ctx.thread.recipient.fetch_message(message_id) + except discord.NotFound: embed = discord.Embed( - color=self.bot.main_color, description="Message no longer exists." + color=self.bot.error_color, description="Message not found or no longer exists." ) else: - embed = discord.Embed(color=self.bot.main_color, description=message.jump_url) + embed = discord.Embed( + color=self.bot.main_color, description=message.jump_url + ) await ctx.send(embed=embed) @commands.command()