feat: save message ref data to MongoDB

Author: khakers

core/clients.py

@@ -673,8 +673,8 @@ async def append_log(
         self,
         message: Message,
         *,
-        message_id: str = "",
-        channel_id: str = "",
+        message_id: str | int = "",
+        channel_id: str | int = "",
         type_: str = "thread_message",
     ) -> dict:
         channel_id = str(channel_id) or str(message.channel.id)
@@ -697,13 +697,40 @@ async def append_log(
                     "id": a.id,
                     "filename": a.filename,
                     # In previous versions this was true for both videos and images
-                    "is_image": a.content_type.startswith("image/"),
+                    "is_image": a.content_type and a.content_type.startswith("image/"),
                     "size": a.size,
                     "url": a.url,
                     "content_type": a.content_type,
                 }
                 for a in message.attachments
             ],
+            "messageReference": {
+                "message_id": message.reference.message_id,
+                "channel_id": message.reference.channel_id,
+                "guild_id": message.reference.guild_id,
+                "type": message.reference.type.name,
+            } if message.reference else None,
+            "messageSnapshots": [
+                {
+                    "type": m.type.name,
+                    "content": m.content,
+                    "attachments": [
+                        {
+                            "id": a.id,
+                            "filename": a.filename,
+                            # In previous versions this was true for both videos and images
+                            "is_image": a.content_type and a.content_type.startswith("image/"),
+                            "size": a.size,
+                            "url": a.url,
+                            "content_type": a.content_type,
+                        }
+                        for a in m.attachments
+                    ],
+                    "timestamp": m.created_at,
+                    "editedTimestamp": m.edited_at,
+                }
+                for m in message.message_snapshots
+            ],
         }
 
         return await self.logs.find_one_and_update(

core/thread.py

@@ -34,6 +34,9 @@
     truncate,
 )
 
+if typing.TYPE_CHECKING:
+    from bot import ModmailBot
+
 logger = getLogger(__name__)
 
 
@@ -44,8 +47,8 @@ def __init__(
         self,
         manager: "ThreadManager",
         recipient: typing.Union[discord.Member, discord.User, int],
-        channel: typing.Union[discord.DMChannel, discord.TextChannel] = None,
-        other_recipients: typing.List[typing.Union[discord.Member, discord.User]] = None,
+        channel: discord.DMChannel | discord.TextChannel | None = None,
+        other_recipients: typing.List[typing.Union[discord.Member, discord.User]] | None = None,
     ):
         self.manager = manager
         self.bot = manager.bot
@@ -1747,13 +1750,14 @@ async def reply(
                     guild.id if hasattr(guild, "id") else guild,
                 )
         else:
-            return await message.channel.send(
+            await message.channel.send(
                 embed=discord.Embed(
                     color=self.bot.error_color,
                     description="Your message could not be delivered since "
                     "the recipient shares no servers with the bot.",
                 )
             )
+            return
 
         user_msg_tasks = []
         tasks = []
@@ -2447,7 +2451,7 @@ class ThreadManager:
     """Class that handles storing, finding and creating Modmail threads."""
 
     def __init__(self, bot):
-        self.bot = bot
+        self.bot: "ModmailBot" = bot
         self.cache = {}
         self.closing = set()