refactor: thread events

VincentRPS · VincentRPS · commit b27c61be495f · 2025-09-05T06:24:46.000+08:00
diff --git a/discord/app/state.py b/discord/app/state.py
@@ -491,108 +491,6 @@ async def query_members(
             )
             raise
 
-    def parse_thread_list_sync(self, data) -> None:
-        guild_id = int(data["guild_id"])
-        guild: Guild | None = self._get_guild(guild_id)
-        if guild is None:
-            _log.debug(
-                "THREAD_LIST_SYNC referencing an unknown guild ID: %s. Discarding",
-                guild_id,
-            )
-            return
-
-        try:
-            channel_ids = set(data["channel_ids"])
-        except KeyError:
-            # If not provided, then the entire guild is being synced
-            # So all previous thread data should be overwritten
-            previous_threads = guild._threads.copy()
-            guild._clear_threads()
-        else:
-            previous_threads = guild._filter_threads(channel_ids)
-
-        threads = {d["id"]: guild._store_thread(d) for d in data.get("threads", [])}
-
-        for member in data.get("members", []):
-            try:
-                # note: member['id'] is the thread_id
-                thread = threads[member["id"]]
-            except KeyError:
-                continue
-            else:
-                thread._add_member(ThreadMember(thread, member))
-
-        for thread in threads.values():
-            old = previous_threads.pop(thread.id, None)
-            if old is None:
-                self.dispatch("thread_join", thread)
-
-        for thread in previous_threads.values():
-            self.dispatch("thread_remove", thread)
-
-    def parse_thread_member_update(self, data) -> None:
-        guild_id = int(data["guild_id"])
-        guild: Guild | None = self._get_guild(guild_id)
-        if guild is None:
-            _log.debug(
-                "THREAD_MEMBER_UPDATE referencing an unknown guild ID: %s. Discarding",
-                guild_id,
-            )
-            return
-
-        thread_id = int(data["id"])
-        thread: Thread | None = guild.get_thread(thread_id)
-        if thread is None:
-            _log.debug(
-                "THREAD_MEMBER_UPDATE referencing an unknown thread ID: %s. Discarding",
-                thread_id,
-            )
-            return
-
-        member = ThreadMember(thread, data)
-        thread.me = member
-        thread._add_member(member)
-
-    def parse_thread_members_update(self, data) -> None:
-        guild_id = int(data["guild_id"])
-        guild: Guild | None = self._get_guild(guild_id)
-        if guild is None:
-            _log.debug(
-                "THREAD_MEMBERS_UPDATE referencing an unknown guild ID: %s. Discarding",
-                guild_id,
-            )
-            return
-
-        thread_id = int(data["id"])
-        thread: Thread | None = guild.get_thread(thread_id)
-        raw = RawThreadMembersUpdateEvent(data)
-        if thread is None:
-            _log.debug(
-                ("THREAD_MEMBERS_UPDATE referencing an unknown thread ID: %s. Discarding"),
-                thread_id,
-            )
-            return
-
-        added_members = [ThreadMember(thread, d) for d in data.get("added_members", [])]
-        removed_member_ids = [int(x) for x in data.get("removed_member_ids", [])]
-        self_id = self.self_id
-        for member in added_members:
-            thread._add_member(member)
-            if member.id != self_id:
-                self.dispatch("thread_member_join", member)
-            else:
-                thread.me = member
-                self.dispatch("thread_join", thread)
-
-        for member_id in removed_member_ids:
-            member = thread._pop_member(member_id)
-            if member_id != self_id:
-                self.dispatch("raw_thread_member_remove", raw)
-                if member is not None:
-                    self.dispatch("thread_member_remove", member)
-            else:
-                thread.me = None
-                self.dispatch("thread_remove", thread)
 
     def parse_guild_member_add(self, data) -> None:
         guild = self._get_guild(int(data["guild_id"]))
diff --git a/discord/events/channel.py b/discord/events/channel.py
@@ -25,7 +25,7 @@
 from datetime import datetime
 from copy import copy
 from typing import Any, Self, TypeVar, cast
-from discord import utils
+from discord.utils.private import get_as_snowflake, parse_time
 from discord.abc import GuildChannel, PrivateChannel
 from discord.app.event_emitter import Event
 from discord.app.state import ConnectionState
@@ -47,7 +47,7 @@ async def __load__(cls, data: dict[str, Any], state: ConnectionState) -> Self |
         if factory is None:
             return
 
-        guild_id = utils._get_as_snowflake(data, "guild_id")
+        guild_id = get_as_snowflake(data, "guild_id")
         guild = await state._get_guild(guild_id)
         if guild is not None:
             # the factory can't be a DMChannel or GroupChannel here
@@ -107,7 +107,7 @@ async def __load__(cls, data: dict[str, Any], state: ConnectionState) -> Self |
             await state.emitter.emit("PRIVATE_CHANNEL_UPDATE", (old_channel, channel))
             return
 
-        guild_id = utils._get_as_snowflake(data, "guild_id")
+        guild_id = get_as_snowflake(data, "guild_id")
         guild = await state._get_guild(guild_id)
         if guild is not None:
             channel = guild.get_channel(channel_id)
@@ -124,7 +124,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     async def __load__(cls, data: dict[str, Any], state: ConnectionState) -> Self | None:
-        guild = await state._get_guild(utils._get_as_snowflake(data, "guild_id"))
+        guild = await state._get_guild(get_as_snowflake(data, "guild_id"))
         channel_id = int(data["id"])
         if guild is not None:
             channel = guild.get_channel(channel_id)
@@ -155,5 +155,5 @@ async def __load__(cls, data: dict[str, Any], state: ConnectionState) -> Self |
 
         self = cls()
         self.channel = channel
-        self.last_pin = utils.parse_time(data["last_pin_timestamp"]) if data["last_pin_timestamp"] else None
+        self.last_pin = parse_time(data["last_pin_timestamp"]) if data["last_pin_timestamp"] else None
         return self
diff --git a/discord/events/gateway.py b/discord/events/gateway.py
@@ -24,7 +24,7 @@
 
 from typing import Any, Self, cast
 
-from discord import utils
+from discord.utils.private import get_as_snowflake
 from discord.emoji import Emoji
 from discord.flags import ApplicationFlags
 from discord.guild import Guild, GuildChannel
@@ -77,7 +77,7 @@ async def __load__(cls, data: dict[str, Any], state: ConnectionState) -> Self:
             except KeyError:
                 pass
             else:
-                self.application_id = utils._get_as_snowflake(application, "id")  # type: ignore
+                self.application_id = get_as_snowflake(application, "id")  # type: ignore
                 # flags will always be present here
                 self.application_flags = ApplicationFlags._from_value(application["flags"])  # type: ignore
                 state.application_id = self.application_id
@@ -213,7 +213,7 @@ class PresenceUpdate(Event):
     @classmethod
     async def __load__(cls, data: Any, state: ConnectionState) -> Self | None:
         self = cls()
-        guild_id = utils._get_as_snowflake(data, "guild_id")
+        guild_id = get_as_snowflake(data, "guild_id")
         guild = await state._get_guild(guild_id)
         if guild is None:
             return
diff --git a/discord/events/message.py b/discord/events/message.py
@@ -23,10 +23,9 @@
 """
 
 from typing import Any, Self
-from discord import utils
+from discord.utils import private as utils, MISSING
 from discord.app.state import ConnectionState
 from discord.channel import StageChannel, TextChannel, VoiceChannel
-from discord.emoji import AppEmoji, GuildEmoji
 from discord.guild import Guild
 from discord.member import Member
 from discord.partial_emoji import PartialEmoji
@@ -135,7 +134,7 @@ async def __load__(cls, data: Any, state: ConnectionState) -> Self:
             self.old.author = new_msg.author
             self.__dict__.update(new_msg.__dict__)
         else:
-            self.old = utils.MISSING
+            self.old = MISSING
             if poll_data := data.get("poll"):
                 channel = await state.get_channel(raw.channel_id)
                 await state.store_poll(
@@ -157,7 +156,7 @@ class ReactionAdd(Event):
     async def __load__(cls, data: ReactionActionEvent, state: ConnectionState) -> Self:
         self = cls()
         emoji = data["emoji"]
-        emoji_id = utils._get_as_snowflake(emoji, "id")
+        emoji_id = utils.get_as_snowflake(emoji, "id")
         emoji = PartialEmoji.with_state(state, id=emoji_id, animated=emoji.get("animated", False), name=emoji["name"])
         raw = RawReactionActionEvent(data, emoji, "REACTION_ADD")
 
@@ -181,7 +180,7 @@ async def __load__(cls, data: ReactionActionEvent, state: ConnectionState) -> Se
             if user:
                 self.user = user
             else:
-                self.user = utils.MISSING
+                self.user = MISSING
 
         return self
 
@@ -204,8 +203,8 @@ async def __load__(cls, data: ReactionClearEvent, state: ConnectionState) -> Sel
             self.message = message
             self.old_reactions = old_reactions
         else:
-            self.message = utils.MISSING
-            self.old_reactions = utils.MISSING
+            self.message = MISSING
+            self.old_reactions = MISSING
         return self
 
 
@@ -220,7 +219,7 @@ class ReactionRemove(Event):
     async def __load__(cls, data: ReactionActionEvent, state: ConnectionState) -> Self:
         self = cls()
         emoji = data["emoji"]
-        emoji_id = utils._get_as_snowflake(emoji, "id")
+        emoji_id = utils.get_as_snowflake(emoji, "id")
         emoji = PartialEmoji.with_state(state, id=emoji_id, animated=emoji.get("animated", False), name=emoji["name"])
         raw = RawReactionActionEvent(data, emoji, "REACTION_ADD")
 
@@ -247,7 +246,7 @@ async def __load__(cls, data: ReactionActionEvent, state: ConnectionState) -> Se
                 if user:
                     self.user = user
                 else:
-                    self.user = utils.MISSING
+                    self.user = MISSING
 
         return self
 
@@ -261,7 +260,7 @@ def __init__(self):
     @classmethod
     async def __load__(cls, data: Any, state: ConnectionState) -> Self | None:
         emoji = data["emoji"]
-        emoji_id = utils._get_as_snowflake(emoji, "id")
+        emoji_id = utils.get_as_snowflake(emoji, "id")
         emoji = PartialEmoji.with_state(self, id=emoji_id, name=emoji["name"])
         raw = RawReactionClearEmojiEvent(data, emoji)
 
diff --git a/discord/events/thread.py b/discord/events/thread.py
