♻️ Cleanup

Author: Paillat-dev

discord/channel.py

@@ -77,7 +77,6 @@
     "PartialMessageable",
     "ForumChannel",
     "ForumTag",
-    # "VoiceChannelEffect",
     "VoiceChannelEffectSendEvent",
 )
 
@@ -3254,6 +3253,11 @@ def get_partial_message(self, message_id: int, /) -> PartialMessage:
 
 
 class VoiceChannelEffectAnimation(NamedTuple):
+    """Represents an animation that can be sent to a voice channel.
+
+    .. versionadded:: 2.7
+    """
+
     id: int
     type: VoiceChannelEffectAnimationType
 
@@ -3264,10 +3268,7 @@ class VoiceChannelSoundEffect(PartialSoundboardSound): ...
 class VoiceChannelEffectSendEvent:
     """Represents the payload for an :func:`on_voice_channel_effect_send`
 
-    .. versionadded:: 2.4
-
-    .. versionchanged:: 2.7
-       Added the `sound` attribute.
+    .. versionadded:: 2.7
 
     Attributes
     ----------

discord/client.py

@@ -2275,7 +2275,7 @@ async def delete_emoji(self, emoji: Snowflake) -> None:
     def get_sound(self, sound_id: int) -> SoundboardSound | None:
         """Gets a :class:`.Sound` from the bot's sound cache.
 
-        .. versionadded:: 2.4
+        .. versionadded:: 2.7
 
         Parameters
         ----------

discord/enums.py

@@ -1055,7 +1055,10 @@ class PollLayoutType(Enum):
 
 
 class VoiceChannelEffectAnimationType(Enum):
-    """Voice channel effect animation type"""
+    """Voice channel effect animation type
+
+    .. versionadded:: 2.7
+    """
 
     premium = 0
     basic = 1

discord/guild.py

@@ -821,7 +821,7 @@ def categories(self) -> list[CategoryChannel]:
     def sounds(self) -> list[SoundboardSound]:
         """A list of soundboard sounds that belong to this guild.
 
-        .. versionadded:: 2.5
+        .. versionadded:: 2.7
 
         This is sorted by the position and are in UI order from top to bottom.
         """
@@ -4316,6 +4316,8 @@ def entitlements(
     def get_sound(self, sound_id: int):
         """Returns a sound with the given ID.
 
+        .. versionadded :: 2.7
+
         Parameters
         ----------
         sound_id: :class:`int`

discord/http.py

@@ -3230,7 +3230,7 @@ def get_guild_sound(
         )
 
     def edit_guild_sound(
-        self, guild_id: Snowflake, sound_Id: Snowflake, *, reason: str | None, **payload
+        self, guild_id: Snowflake, sound_id: Snowflake, *, reason: str | None, **payload
     ):
         keys = (
             "name",
@@ -3246,14 +3246,14 @@ def edit_guild_sound(
                 "PATCH",
                 "/guilds/{guild_id}/soundboard-sounds/{sound_id}",
                 guild_id=guild_id,
-                sound_id=sound_Id,
+                sound_id=sound_id,
             ),
             json=payload,
             reason=reason,
         )
 
     def send_soundboard_sound(
-        self, chanel_id: int, sound: PartialSoundboardSound
+        self, channel_id: int, sound: PartialSoundboardSound
     ) -> None:
         payload = {
             "sound_id": sound.id,
@@ -3265,7 +3265,7 @@ def send_soundboard_sound(
             Route(
                 "POST",
                 "/channels/{channel_id}/send-soundboard-sound",
-                channel_id=chanel_id,
+                channel_id=channel_id,
             ),
             json=payload,
         )

discord/soundboard.py

@@ -30,7 +30,7 @@
 from typing_extensions import override
 
 from .asset import Asset
-from .emoji import GuildEmoji, PartialEmoji, _EmojiTag
+from .emoji import PartialEmoji, _EmojiTag
 from .mixins import Hashable
 from .types.channel import (
     VoiceChannelEffectSendEvent as VoiceChannelEffectSendEventPayload,
@@ -53,16 +53,16 @@
 class PartialSoundboardSound(Hashable):
     """A partial soundboard sound.
 
+    .. versionadded:: 2.7
+
     Attributes
     ----------
     id: :class:`int`
         The sound's ID.
     volume: :class:`float`
         The sound's volume.
-    emoji: :class:`PartialEmoji`
-        The sound's emoji.
-
-    .. versionadded:: 2.7
+    emoji: :class:`PartialEmoji` | :class:`None`
+        The sound's emoji. Could be ``None`` if the sound has no emoji.
     """
 
     __slots__ = ("id", "volume", "emoji", "_http", "_state")
@@ -84,11 +84,14 @@ def _from_data(
         self.volume = (
             float(data.get("volume", 0) or data.get("sound_volume", 0)) or None
         )
+        self.emoji = None
         if raw_emoji := data.get(
             "emoji"
         ):  # From gateway event (VoiceChannelEffectSendEventPayload)
             self.emoji = PartialEmoji.from_dict(raw_emoji)
-        else:  # From HTTP response (SoundboardSoundPayload)
+        elif data.get("emoji_name") or data.get(
+            "emoji_id"
+        ):  # From HTTP response (SoundboardSoundPayload)
             self.emoji = PartialEmoji(
                 name=data.get("emoji_name"),
                 id=int(data.get("emoji_id", 0) or 0) or None,
@@ -120,25 +123,25 @@ def __repr__(self) -> str:
 class SoundboardSound(PartialSoundboardSound):
     """Represents a soundboard sound.
 
+    .. versionadded:: 2.7
+
     Attributes
     ----------
     id: :class:`int`
         The sound's ID.
     volume: :class:`float`
         The sound's volume.
+    emoji: :class:`PartialEmoji` | :class:`None`
+        The sound's emoji. Could be ``None`` if the sound has no emoji.
     name: :class:`str`
         The sound's name.
     available: :class:`bool`
         Whether the sound is available. Could be ``False`` if the sound is not available.
         This happens for example when the guild lost the boost level required to use the sound.
-    emoji: :class:`PartialEmoji`
-        The sound's emoji.
-    guild: :class:`Guild` | :class:`None`
-        The guild the sound belongs to. Could be ``None`` if the sound is a default sound.
-    owner: :class:`User`
+    guild_id: :class:`int` | :class:`None`
+        The ID of the guild the sound belongs to. Could be :class:`None` if the sound is a default sound.
+    user: :class:`User` | :class:`None`
         The sound's owner. Could be ``None`` if the sound is a default sound.
-
-    .. versionadded:: 2.7
     """
 
     __slots__ = (
@@ -172,11 +175,7 @@ def _from_data(
 
     @cached_slot_property("_cs_guild")
     def guild(self) -> Guild | None:
-        """:class:`Guild`: The guild the sound belongs to.
-
-        The :class:`Guild` object representing the guild the sound belongs to.
-        .. versionadded:: 2.7
-        """
+        """:class:`Guild` | :class:`None` The guild the sound belongs to. Could be :class:`None` if the sound is a default sound."""
         return self._state._get_guild(self.guild_id) if self.guild_id else None
 
     @override

discord/state.py

@@ -2004,7 +2004,6 @@ def create_message(
         return Message(state=self, channel=channel, data=data)
 
     def parse_voice_channel_effect_send(self, data) -> None:
-        __import__("json")
         if sound_id := int(data.get("sound_id", 0)):
             sound = self._get_sound(sound_id)
             if sound is None: