fix: internals

Signed-off-by: lorenzo132 <[email protected]>

Author: lorenzo132

core/clients.py

@@ -648,6 +648,7 @@ async def append_log(
         message: Message,
         *,
         message_id: str = "",
+        log_key: str = None,
         channel_id: str = "",
         type_: str = "thread_message",
     ) -> dict:
@@ -678,14 +679,31 @@ async def append_log(
             ],
         }
 
-        return await self.logs.find_one_and_update(
-            {"channel_id": channel_id}, {"$push": {"messages": data}}, return_document=True
-        )
+        # Use log_key if provided, fallback to channel_id for legacy support
+        if log_key:
+            return await self.logs.find_one_and_update(
+                {"key": log_key}, {"$push": {"messages": data}}, return_document=True
+            )
+        else:
+            return await self.logs.find_one_and_update(
+                {"channel_id": channel_id}, {"$push": {"messages": data}}, return_document=True
+            )
 
-    async def post_log(self, channel_id: Union[int, str], data: dict) -> dict:
-        return await self.logs.find_one_and_update(
-            {"channel_id": str(channel_id)}, {"$set": data}, return_document=True
-        )
+    async def get_log_by_key(self, log_key: str) -> dict:
+        return await self.logs.find_one({"key": log_key})
+
+    async def post_log_by_key(self, log_key: str, data: dict) -> dict:
+        return await self.logs.find_one_and_update({"key": log_key}, {"$set": data}, return_document=True)
+
+    async def post_log(
+        self, channel_id: Union[int, str] = None, data: dict = None, log_key: str = None
+    ) -> dict:
+        if log_key:
+            return await self.post_log_by_key(log_key, data)
+        else:
+            return await self.logs.find_one_and_update(
+                {"channel_id": str(channel_id)}, {"$set": data}, return_document=True
+            )
 
     async def search_closed_by(self, user_id: Union[int, str]):
         return await self.logs.find(

core/thread.py

@@ -69,6 +69,7 @@ def __init__(
         # --- SNOOZE STATE ---
         self.snoozed = False  # True if thread is snoozed
         self.snooze_data = None  # Dict with channel/category/position/messages for restoration
+        self.log_key = None  # Unique log key for this thread
 
     def __repr__(self):
         return f'Thread(recipient="{self.recipient or self.id}", channel={self.channel.id}, other_recipients={len(self._other_recipients)})'
@@ -342,11 +343,11 @@ async def setup(self, *, creator=None, category=None, initial_message=None):
         self._channel = channel
 
         try:
-            log_url, log_data = await asyncio.gather(
-                self.bot.api.create_log_entry(recipient, channel, creator or recipient),
-                self.bot.api.get_user_logs(recipient.id),
-            )
-
+            # create_log_entry now returns the log key (URL)
+            log_url = await self.bot.api.create_log_entry(recipient, channel, creator or recipient)
+            # Extract the log key from the URL
+            self.log_key = log_url.rstrip("/").split("/")[-1]
+            log_data = await self.bot.api.get_user_logs(recipient.id)
             log_count = sum(1 for log in log_data if not log["open"])
         except Exception:
             logger.error("An error occurred while posting logs to the database.", exc_info=True)
@@ -583,7 +584,25 @@ async def _close(self, closer, silent=False, delete_channel=True, message=None,
         self.bot.config["notification_squad"].pop(str(self.id), None)
 
         # Logging
-        if self.channel:
+        if self.log_key:
+            log_data = await self.bot.api.post_log(
+                log_key=self.log_key,
+                data={
+                    "open": False,
+                    "title": match_title(self.channel.topic) if self.channel else None,
+                    "closed_at": str(discord.utils.utcnow()),
+                    "nsfw": self.channel.nsfw if self.channel else None,
+                    "close_message": message,
+                    "closer": {
+                        "id": str(closer.id),
+                        "name": closer.name,
+                        "discriminator": closer.discriminator,
+                        "avatar_url": closer.display_avatar.url,
+                        "mod": True,
+                    },
+                },
+            )
+        elif self.channel:
             log_data = await self.bot.api.post_log(
                 self.channel.id,
                 {
@@ -608,9 +627,8 @@ async def _close(self, closer, silent=False, delete_channel=True, message=None,
             prefix = self.bot.config["log_url_prefix"].strip("/")
             if prefix == "NONE":
                 prefix = ""
-            log_url = (
-                f"{self.bot.config['log_url'].strip('/')}{'/' + prefix if prefix else ''}/{log_data['key']}"
-            )
+            log_key = log_data.get("key") or self.log_key
+            log_url = f"{self.bot.config['log_url'].strip('/')}{'/' + prefix if prefix else ''}/{log_key}"
 
             if log_data["title"]:
                 sneak_peak = log_data["title"]
@@ -967,7 +985,9 @@ async def note(
 
         # Log as 'internal' type for logviewer visibility
         self.bot.loop.create_task(
-            self.bot.api.append_log(message, message_id=msg.id, channel_id=self.channel.id, type_="internal")
+            self.bot.api.append_log(
+                message, message_id=msg.id, log_key=self.log_key, channel_id=self.channel.id, type_="internal"
+            )
         )
 
         return msg
@@ -1041,6 +1061,7 @@ async def reply(
                 self.bot.api.append_log(
                     message,
                     message_id=msg.id,
+                    log_key=self.log_key,
                     channel_id=self.channel.id,
                     type_="anonymous" if anonymous else "thread_message",
                 )
@@ -1094,7 +1115,9 @@ async def send(
             await self.wait_until_ready()
 
         if not from_mod and not note:
-            self.bot.loop.create_task(self.bot.api.append_log(message, channel_id=self.channel.id))
+            self.bot.loop.create_task(
+                self.bot.api.append_log(message, log_key=self.log_key, channel_id=self.channel.id)
+            )
 
         destination = destination or self.channel