🐛 Fixes

Author: Paillat-dev

discord/app/cache.py

@@ -28,6 +28,7 @@
 from discord import utils
 from discord.member import Member
 from discord.message import Message
+from discord.soundboard import SoundboardSound
 
 from ..channel import DMChannel
 from ..emoji import AppEmoji, GuildEmoji
@@ -166,6 +167,13 @@ async def get_all_members(self) -> list[Member]: ...
 
     async def clear(self, views: bool = True) -> None: ...
 
+    async def store_sound(self, sound: SoundboardSound) -> None: ...
+
+    async def get_sound(self, sound_id: int) -> SoundboardSound | None: ...
+
+    async def get_all_sounds(self) -> list[SoundboardSound]: ...
+
+    async def delete_sound(self, sound_id: int) -> None: ...
 
 class MemoryCache(Cache):
     def __init__(self, max_messages: int | None = None) -> None:
@@ -177,6 +185,7 @@ def __init__(self, max_messages: int | None = None) -> None:
         self._stickers: dict[int, list[GuildSticker]] = {}
         self._views: dict[str, View] = {}
         self._modals: dict[str, Modal] = {}
+        self._sounds: dict[int, SoundboardSound] = {}
         self._messages: Deque[Message] = deque(maxlen=self.max_messages)
 
         self._emojis: dict[int, list[GuildEmoji | AppEmoji]] = {}
@@ -186,6 +195,8 @@ def __init__(self, max_messages: int | None = None) -> None:
 
         self._guild_members: dict[int, dict[int, Member]] = defaultdict(dict)
 
+
+
     def _flatten(self, matrix: list[list[T]]) -> list[T]:
         return [item for row in matrix for item in row]
 
@@ -396,3 +407,15 @@ async def get_guild_members(self, guild_id: int) -> list[Member]:
 
     async def get_all_members(self) -> list[Member]:
         return self._flatten([list(members.values()) for members in self._guild_members.values()])
+
+    async def store_sound(self, sound: SoundboardSound) -> None:
+        self._sounds[sound.id] = sound
+
+    async def get_sound(self, sound_id: int) -> SoundboardSound | None:
+        return self._sounds.get(sound_id)
+
+    async def get_all_sounds(self) -> list[SoundboardSound]:
+        return list(self._sounds.values())
+
+    async def delete_sound(self, sound_id: int) -> None:
+        self._sounds.pop(sound_id, None)

discord/app/state.py

@@ -44,6 +44,8 @@
     cast,
 )
 
+from discord.soundboard import SoundboardSound
+
 from .. import utils
 from ..activity import BaseActivity
 from ..automod import AutoModRule
@@ -237,7 +239,7 @@ def __init__(
         self._voice_clients: dict[int, VoiceClient] = {}
 
         if not intents.members or cache_flags._empty:
-            self.store_user = self.create_user  # type: ignore
+            self.store_user = self.create_user_async  # type: ignore
             self.deref_user = self.deref_user_no_intents  # type: ignore
 
         self.cache_app_emojis: bool = options.get("cache_app_emojis", False)
@@ -320,6 +322,9 @@ async def deref_user(self, user_id: int) -> None:
     def create_user(self, data: UserPayload) -> User:
         return User(state=self, data=data)
 
+    async def create_user_async(self, data: UserPayload) -> User:
+        return User(state=self, data=data)
+
     def deref_user_no_intents(self, user_id: int) -> None:
         return
 
@@ -373,6 +378,21 @@ async def _remove_guild(self, guild: Guild) -> None:
 
         del guild
 
+    async def _add_default_sounds(self) -> None:
+        default_sounds = await self.http.get_default_sounds()
+        for default_sound in default_sounds:
+            sound = SoundboardSound(state=self, http=self.http, data=default_sound)
+            await self._add_sound(sound)
+
+    async def _add_sound(self, sound: SoundboardSound) -> None:
+        await self.cache.store_sound(sound)
+
+    async def _remove_sound(self, sound: SoundboardSound) -> None:
+        await self.cache.delete_sound(sound.id)
+
+    async def get_sounds(self) -> list[SoundboardSound]:
+        return list(await self.cache.get_all_sounds())
+
     async def get_emojis(self) -> list[GuildEmoji | AppEmoji]:
         return await self.cache.get_all_emojis()
 
@@ -487,15 +507,15 @@ async def query_members(
             )
             raise
 
-    def _get_create_guild(self, data):
+    async def _get_create_guild(self, data):
         if data.get("unavailable") is False:
             # GUILD_CREATE with unavailable in the response
             # usually means that the guild has become available
             # and is therefore in the cache
-            guild = self._get_guild(int(data["id"]))
+            guild = await self._get_guild(int(data["id"]))
             if guild is not None:
                 guild.unavailable = False
-                guild._from_data(data)
+                await guild._from_data(data, self)
                 return guild
 
         return self._add_guild_from_data(data)
@@ -660,6 +680,7 @@ async def _delay_ready(self) -> None:
                     future = asyncio.ensure_future(self.chunk_guild(guild))
                     current_bucket.append(future)
                 else:
+                    await self._add_default_sounds()
                     future = self.loop.create_future()
                     future.set_result([])
 

discord/events/channel.py

@@ -73,7 +73,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: tuple[PrivateChannel | None, PrivateChannel], _: ConnectionState) -> Self | None:
+    async def __load__(cls, data: tuple[PrivateChannel | None, PrivateChannel], state: ConnectionState) -> Self | None:
         self = cls()
         self.old = data[0]
         self.__dict__.update(data[1].__dict__)
@@ -89,7 +89,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: tuple[GuildChannel | None, GuildChannel], _: ConnectionState) -> Self | None:
+    async def __load__(cls, data: tuple[GuildChannel | None, GuildChannel], state: ConnectionState) -> Self | None:
         self = cls()
         self.old = data[0]
         self.__dict__.update(data[1].__dict__)

discord/events/gateway.py

@@ -131,7 +131,7 @@ async def __load__(cls, data: GuildPayload, state: ConnectionState) -> Self:
             guild = await Guild._from_data(data, state)
             await state._add_guild(guild)
         self.guild = guild
-        self.__dict__.update(self.guild.__dict__)
+        # self.__dict__.update(self.guild.__dict__) # TODO: Find another way to do this
         if state._guild_needs_chunking(guild):
             await state.chunk_guild(guild)
         if guild.unavailable:
@@ -153,10 +153,10 @@ def __init__(self) -> None:
 
     @classmethod
     @override
-    async def __load__(cls, data: Guild, _: ConnectionState) -> Self:
+    async def __load__(cls, data: Guild, state: ConnectionState) -> Self:
         self = cls()
         self.guild = data
-        self.__dict__.update(self.guild.__dict__)
+        # self.__dict__.update(self.guild.__dict__) # TODO: Find another way to do this
         return self
 
 
@@ -172,10 +172,10 @@ def __init__(self) -> None:
 
     @classmethod
     @override
-    async def __load__(cls, data: Guild, _: ConnectionState) -> Self:
+    async def __load__(cls, data: Guild, state: ConnectionState) -> Self:
         self = cls()
         self.guild = data
-        self.__dict__.update(self.guild.__dict__)
+        # self.__dict__.update(self.guild.__dict__) # TODO: Find another way to do this
         return self
 
 

discord/events/guild.py

@@ -255,9 +255,9 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: Guild, _: ConnectionState) -> Self:
+    async def __load__(cls, data: Guild, state: ConnectionState) -> Self:
         self = cls()
-        self.__dict__.update(data.__dict__)
+        # self.__dict__.update(data.__dict__) # TODO: Find another way to do this
         return self
 
 
@@ -268,7 +268,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: Guild, _: ConnectionState) -> Self:
+    async def __load__(cls, data: Guild, state: ConnectionState) -> Self:
         self = cls()
         self.__dict__.update(data.__dict__)
         return self
@@ -281,9 +281,9 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: Guild, _: ConnectionState) -> Self:
+    async def __load__(cls, data: Guild, state: ConnectionState) -> Self:
         self = cls()
-        self.__dict__.update(data.__dict__)
+        # self.__dict__.update(data.__dict__) # TODO: Find another way to do this
         return self
 
 
@@ -323,7 +323,7 @@ async def __load__(cls, data: Any, state: ConnectionState) -> Self | None:
             await state.emitter.emit("GUILD_JOIN", guild)
 
         self = cls()
-        self.__dict__.update(data.__dict__)
+        # self.__dict__.update(data.__dict__) # TODO: Find another way to do this
         return self
 
 

discord/events/thread.py

@@ -46,7 +46,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: ThreadMember, _: ConnectionState) -> Self:
+    async def __load__(cls, data: ThreadMember, state: ConnectionState) -> Self:
         self = cls()
         self.__dict__.update(data.__dict__)
         return self
@@ -59,7 +59,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: Thread, _: ConnectionState) -> Self:
+    async def __load__(cls, data: Thread, state: ConnectionState) -> Self:
         self = cls()
         self.__dict__.update(data.__dict__)
         return self
@@ -72,7 +72,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: ThreadMember, _: ConnectionState) -> Self:
+    async def __load__(cls, data: ThreadMember, state: ConnectionState) -> Self:
         self = cls()
         self.__dict__.update(data.__dict__)
         return self
@@ -85,7 +85,7 @@ def __init__(self) -> None: ...
 
     @classmethod
     @override
-    async def __load__(cls, data: Thread, _: ConnectionState) -> Self:
+    async def __load__(cls, data: Thread, state: ConnectionState) -> Self:
         self = cls()
         self.__dict__.update(data.__dict__)
         return self

discord/gateway.py

@@ -367,31 +367,6 @@ async def from_client(
         await ws.resume()
         return ws
 
-    def wait_for(self, event, predicate, result=None):
-        """Waits for a DISPATCH'd event that meets the predicate.
-
-        Parameters
-        ----------
-        event: :class:`str`
-            The event name in all upper case to wait for.
-        predicate
-            A function that takes a data parameter to check for event
-            properties. The data parameter is the 'd' key in the JSON message.
-        result
-            A function that takes the same data parameter and executes to send
-            the result to the future. If ``None``, returns the data.
-
-        Returns
-        -------
-        asyncio.Future
-            A future to wait for.
-        """
-
-        future = self.loop.create_future()
-        entry = EventListener(event=event, predicate=predicate, result=result, future=future)
-        self._dispatch_listeners.append(entry)
-        return future
-
     async def identify(self):
         """Sends the IDENTIFY packet."""
         payload = {
@@ -538,31 +513,6 @@ async def received_message(self, msg, /):
 
         await self._emitter.emit(event, data)
 
-        # remove the dispatched listeners
-        removed = []
-        for index, entry in enumerate(self._dispatch_listeners):
-            if entry.event != event:
-                continue
-
-            future = entry.future
-            if future.cancelled():
-                removed.append(index)
-                continue
-
-            try:
-                valid = entry.predicate(data)
-            except Exception as exc:
-                future.set_exception(exc)
-                removed.append(index)
-            else:
-                if valid:
-                    ret = data if entry.result is None else entry.result(data)
-                    future.set_result(ret)
-                    removed.append(index)
-
-        for index in reversed(removed):
-            del self._dispatch_listeners[index]
-
     @property
     def latency(self) -> float:
         """Measures latency between a HEARTBEAT and a HEARTBEAT_ACK in seconds. If no heartbeat

discord/gears/gear.py

@@ -93,7 +93,7 @@ def listen(
         @hybridmethod
         def listen(
             cls: type[_T],
-            event: type[E],  # noqa: N805
+            event: type[E],
         ) -> Callable[[Callable[[Any, E], Awaitable[None]]], InstanceEventCallback[E]]:
             def decorator(func: Callable[[Any, E], Awaitable[None]]) -> InstanceEventCallback[E]:
                 func.__is_instance_method__ = True

discord/guild.py

@@ -324,7 +324,7 @@ def _voice_state_for(self, user_id: int, /) -> VoiceState | None:
         return self._voice_states.get(user_id)
 
     async def _add_member(self, member: Member, /) -> None:
-        await cast(ConnectionState, self._state).cache.store_member(member)
+        await cast("ConnectionState", self._state).cache.store_member(member)
 
     async def _get_and_update_member(self, payload: MemberPayload, user_id: int, cache_flag: bool, /) -> Member:
         members = await cast(ConnectionState, self._state).cache.get_guild_members(self.id)
@@ -549,7 +549,7 @@ async def _from_data(cls, guild: GuildPayload, state: ConnectionState) -> Self:
 
     def _add_sound(self, sound: SoundboardSound) -> None:
         self._sounds[sound.id] = sound
-        self._state._add_sound(sound)
+        await self._state._add_sound(sound)
 
     def _remove_sound(self, sound_id: int) -> None:
         self._sounds.pop(sound_id, None)