feat: more thread events

Author: VincentRPS

discord/app/state.py

@@ -519,57 +519,6 @@ async def query_members(
             )
             raise
 
-
-    def parse_thread_update(self, data) -> None:
-        guild_id = int(data["guild_id"])
-        guild = self._get_guild(guild_id)
-        raw = RawThreadUpdateEvent(data)
-        if guild is None:
-            _log.debug(
-                "THREAD_UPDATE referencing an unknown guild ID: %s. Discarding",
-                guild_id,
-            )
-            return
-        else:
-            thread = guild.get_thread(raw.thread_id)
-            if thread is not None:
-                old = copy.copy(thread)
-                thread._update(data)
-                if thread.archived:
-                    guild._remove_thread(thread)
-                self.dispatch("thread_update", old, thread)
-            else:
-                thread = Thread(guild=guild, state=guild._state, data=data)
-                if not thread.archived:
-                    guild._add_thread(thread)
-                self.dispatch("thread_join", thread)
-            raw.thread = thread
-        self.dispatch("raw_thread_update", raw)
-
-    def parse_thread_delete(self, data) -> None:
-        guild_id = int(data["guild_id"])
-        guild = self._get_guild(guild_id)
-
-        if guild is None:
-            _log.debug(
-                "THREAD_DELETE referencing an unknown guild ID: %s. Discarding",
-                guild_id,
-            )
-            return
-
-        raw = RawThreadDeleteEvent(data)
-        thread = guild.get_thread(raw.thread_id)
-        raw.thread = thread
-
-        self.dispatch("raw_thread_delete", raw)
-
-        if thread is not None:
-            guild._remove_thread(thread)  # type: ignore
-            self.dispatch("thread_delete", thread)
-
-            if (msg := thread.starting_message) is not None:
-                msg.thread = None
-
     def parse_thread_list_sync(self, data) -> None:
         guild_id = int(data["guild_id"])
         guild: Guild | None = self._get_guild(guild_id)

discord/events/thread.py

@@ -1,8 +1,11 @@
-from typing import Any, Self
+from typing import Any, Self, cast
 from discord import utils
+from discord.abc import Snowflake
 from discord.app.event_emitter import Event
 from discord.app.state import ConnectionState
+from discord.raw_models import RawThreadDeleteEvent, RawThreadUpdateEvent
 from discord.threads import Thread, ThreadMember
+from discord.types.raw_models import ThreadDeleteEvent, ThreadUpdateEvent
 
 
 class ThreadCreate(Event, Thread):
@@ -40,7 +43,64 @@ async def __load__(cls, data: dict[str, Any], state: ConnectionState) -> Self |
                     )
                 )
                 self.just_joined = False
+            self.__dict__.update(thread.__dict__)
         else:
+            self.__dict__.update(cached_thread.__dict__)
             self.just_joined = True
 
         return self
+
+class ThreadUpdate(Event, Thread):
+    __event_name__ = "THREAD_UPDATE"
+
+    def __init__(self) -> None:
+        ...
+
+    old: Thread
+
+    @classmethod
+    async def __load__(cls, data: ThreadUpdateEvent, state: ConnectionState) -> Self | None:
+        guild_id = int(data["guild_id"])
+        guild = await state._get_guild(guild_id)
+        raw = RawThreadUpdateEvent(data)
+        if guild is None:
+            return
+
+        self = cls()
+
+        thread = guild.get_thread(raw.thread_id)
+        if thread:
+            self.old = thread
+            await thread._update(thread)
+            if thread.archived:
+                guild._remove_thread(cast(Snowflake, raw.thread_id))
+        else:
+            thread = Thread(guild=guild, state=guild._state, data=data) # type: ignore
+            if not thread.archived:
+                guild._add_thread(thread)
+
+        self.__dict__.update(thread.__dict__)
+        return self
+
+class ThreadDelete(Event, Thread):
+    __event_name__ = "THREAD_DELETE"
+
+    def __init__(self) -> None:
+        ...
+
+    @classmethod
+    async def __load__(cls, data: ThreadDeleteEvent, state: ConnectionState) -> Self | None:
+        raw = RawThreadDeleteEvent(data)
+        guild = await state._get_guild(raw.guild_id)
+        if guild is None:
+            return
+
+        self = cls()
+
+        thread = guild.get_thread(raw.thread_id)
+        if thread:
+            guild._remove_thread(cast(Snowflake, thread.id))
+            if (msg := await thread.get_starting_message()) is not None:
+                msg.thread = None # type: ignore
+
+        return cast(Self, thread)