Resolve issues with deleting messages

Author: fourjr

bot.py

@@ -1415,11 +1415,12 @@ async def on_message_delete(self, message):
             if not thread:
                 return
             try:
-                message = await thread.find_linked_message_from_dm(message)
+                message = await thread.find_linked_message_from_dm(message, get_thread_channel=True)
             except ValueError as e:
                 if str(e) != "Thread channel message not found.":
                     logger.debug("Failed to find linked message to delete: %s", e)
                 return
+            message = message[0]
             embed = message.embeds[0]
             embed.set_footer(text=f"{embed.footer.text} (deleted)", icon_url=embed.footer.icon_url)
             await message.edit(embed=embed)

core/thread.py

@@ -695,7 +695,7 @@ async def delete_message(
             await asyncio.gather(*tasks)
 
     async def find_linked_message_from_dm(
-        self, message, either_direction=False
+        self, message, either_direction=False, get_thread_channel=False
     ) -> typing.List[discord.Message]:
 
         joint_id = None
@@ -726,6 +726,10 @@ async def find_linked_message_from_dm(
         else:
             raise ValueError("Thread channel message not found.")
 
+        if get_thread_channel:
+            # end early as we only want the main message from thread channel
+            return linked_messages
+
         if joint_id is None:
             joint_id = get_joint_id(linked_messages[0])
             if joint_id is None:

core/utils.py

@@ -467,7 +467,9 @@ def get_joint_id(message: discord.Message) -> typing.Optional[int]:
     """
     if message.embeds:
         try:
-            return int(getattr(message.embeds[0].author, "url", "").split("#")[-1])
+            url = getattr(message.embeds[0].author, "url", "")
+            if url:
+                return int(url.split("#")[-1])
         except ValueError:
             pass
     return None