refactor: move VoiceChannelEffect to disnake.channel

DisnakeDev · shiftinv · Nov 13, 2024 · Mar 30, 2023 · Mar 30, 2023 · Mar 30, 2023
commit b46070a6475466bc70455aa5d46923821f84cdb1
diff --git a/disnake/channel.py b/disnake/channel.py
@@ -35,6 +35,7 @@
     ThreadLayout,
     ThreadSortOrder,
     VideoQualityMode,
+    VoiceChannelEffectAnimationType,
     try_enum,
     try_enum_to_int,
 )
@@ -50,6 +51,7 @@
 from .utils import MISSING
 
 __all__ = (
+    "VoiceChannelEffect",
     "TextChannel",
     "VoiceChannel",
     "StageChannel",
@@ -87,13 +89,52 @@
     )
     from .types.snowflake import SnowflakeList
     from .types.threads import ThreadArchiveDurationLiteral
+    from .types.voice import VoiceChannelEffect as VoiceChannelEffectPayload
     from .ui.action_row import Components, MessageUIComponent
     from .ui.view import View
     from .user import BaseUser, ClientUser, User
     from .voice_region import VoiceRegion
     from .webhook import Webhook
 
 
+class VoiceChannelEffect:
+    """An effect sent by a member in a voice channel.
+
+    Different sets of attributes will be present, depending on the type of effect.
+
+    .. versionadded:: 2.9
+
+    Attributes
+    ----------
+    emoji: Optional[:class:`PartialEmoji`]
+        The emoji, if this is an emoji reaction effect.
+    animation_type: Optional[:class:`VoiceChannelEffectAnimationType`]
+        The animation type, if this is an emoji reaction effect.
+    animation_id: Optional[:class:`int`]
+        The animation ID, if this is an emoji reaction effect.
+    """
+
+    __slots__ = (
+        "emoji",
+        "animation_type",
+        "animation_id",
+    )
+
+    def __init__(self, data: VoiceChannelEffectPayload, emoji: Optional[PartialEmoji]) -> None:
+        # TODO: store raw payload as well?
+
+        self.emoji: Optional[PartialEmoji] = emoji
+        self.animation_type = (
+            try_enum(VoiceChannelEffectAnimationType, value)
+            if (value := data.get("animation_type")) is not None
+            else None
+        )
+        try:
+            self.animation_id: Optional[int] = int(data["animation_id"])
+        except KeyError:
+            self.animation_id: Optional[int] = None
+
+
 async def _single_delete_strategy(messages: Iterable[Message]) -> None:
     for m in messages:
         await m.delete()

diff --git a/disnake/raw_models.py b/disnake/raw_models.py
@@ -5,7 +5,8 @@
 import datetime
 from typing import TYPE_CHECKING, List, Literal, Optional, Set, Union, cast
 
-from .enums import ChannelType, VoiceChannelEffectAnimationType, try_enum
+from .channel import VoiceChannelEffect
+from .enums import ChannelType, try_enum
 from .utils import get_slots
 
 if TYPE_CHECKING:
@@ -28,7 +29,6 @@
         TypingStartEvent,
         VoiceChannelEffectSendEvent,
     )
-    from .types.voice import VoiceChannelEffect as VoiceChannelEffectPayload
     from .user import User
 
 
@@ -45,7 +45,6 @@
     "RawThreadMemberRemoveEvent",
     "RawTypingEvent",
     "RawGuildMemberRemoveEvent",
-    "VoiceChannelEffect",
     "RawVoiceChannelEffectEvent",
 )
 
@@ -428,44 +427,6 @@ def __init__(self, user: Union[User, Member], guild_id: int) -> None:
         self.guild_id: int = guild_id
 
 
-class VoiceChannelEffect(_RawReprMixin):
-    """An effect sent by a member in a voice channel.
-
-    Different sets of attributes will be present, depending on the type of effect.
-
-    .. versionadded:: 2.9
-
-    Attributes
-    ----------
-    emoji: Optional[:class:`PartialEmoji`]
-        The emoji, if this is an emoji reaction effect.
-    animation_type: Optional[:class:`VoiceChannelEffectAnimationType`]
-        The animation type, if this is an emoji reaction effect.
-    animation_id: Optional[:class:`int`]
-        The animation ID, if this is an emoji reaction effect.
-    """
-
-    __slots__ = (
-        "emoji",
-        "animation_type",
-        "animation_id",
-    )
-
-    def __init__(self, data: VoiceChannelEffectPayload, emoji: Optional[PartialEmoji]) -> None:
-        # TODO: store raw payload as well?
-
-        self.emoji: Optional[PartialEmoji] = emoji
-        self.animation_type = (
-            try_enum(VoiceChannelEffectAnimationType, value)
-            if (value := data.get("animation_type")) is not None
-            else None
-        )
-        try:
-            self.animation_id: Optional[int] = int(data["animation_id"])
-        except KeyError:
-            self.animation_id: Optional[int] = None
-
-
 class RawVoiceChannelEffectEvent(_RawReprMixin):
     """Represents the event payload for an :func:`on_raw_voice_channel_effect` event.