From 8264680e21ffaf9894a077c6d5323ef94568719a Mon Sep 17 00:00:00 2001 From: nexy7574 Date: Tue, 23 Jul 2024 16:37:40 +0100 Subject: [PATCH] Improve twitter fix --- src/cogs/net.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/cogs/net.py b/src/cogs/net.py index a1c61eb..82d15a7 100644 --- a/src/cogs/net.py +++ b/src/cogs/net.py @@ -501,6 +501,7 @@ class NetworkCog(commands.Cog): @commands.Cog.listener() async def on_message(self, message: discord.Message): content = message.content.split() + new_links = [] for section in content: if section.startswith("<") and section.endswith(">"): continue @@ -508,9 +509,20 @@ class NetworkCog(commands.Cog): parsed = urllib.parse.urlparse(section) if parsed.netloc in ("x.com", "twitter.com"): parsed = parsed._replace(netloc="fixupx.com") - await message.channel.send(parsed.geturl(), reference=message) - if message.channel.permissions_for(message.guild.me).manage_messages: - await message.edit(suppress=True) + new_links.append(parsed.geturl()) + if len(content) == 1: # just link + await message.delete(delay=0.1, reason="Fixed twitter link") + await message.channel.send( + f"**{message.author.mention}**:\n" + " | ".join(new_links), + allowed_mentions=discord.AllowedMentions.none(), + ) + else: + await message.edit(suppress=True) + await message.channel.send( + " | ".join(new_links), + allowed_mentions=discord.AllowedMentions.none(), + reference=message + ) def setup(bot):