errors yay

Author: DA-344

discord/_voice_aliases.py

@@ -26,7 +26,7 @@
 
 from typing import TYPE_CHECKING
 
-from .utils import warn_deprecated
+from .utils import deprecated
 
 """
 since discord.voice raises an error when importing it without having the
@@ -60,12 +60,12 @@ def VoiceClient(client, channel) -> VoiceClientC:
     def VoiceProtocol(client, channel) -> VoiceProtocolC:
         ...
 else:
-    @warn_deprecated("discord.VoiceClient", "discord.voice.VoiceClient", "2.7", "3.0")
+    @deprecated("discord.VoiceClient", "discord.voice.VoiceClient", "2.7", "3.0")
     def VoiceClient(client, channel):
         from discord.voice import VoiceClient
         return VoiceClient(client, channel)
 
-    @warn_deprecated("discord.VoiceProtocol", "discord.voice.VoiceProtocol", "2.7", "3.0")
+    @deprecated("discord.VoiceProtocol", "discord.voice.VoiceProtocol", "2.7", "3.0")
     def VoiceProtocol(client, channel):
         from discord.voice import VoiceProtocol
         return VoiceProtocol(client, channel)

discord/opus.py

@@ -28,7 +28,6 @@
 import array
 import ctypes
 import ctypes.util
-import gc
 import logging
 import math
 import os.path
@@ -37,13 +36,12 @@
 from typing import TYPE_CHECKING, Any, Callable, Literal, TypedDict, TypeVar
 
 from discord.voice.packets.rtp import FakePacket
-from discord.voice.utils.wrapped import gap_wrapped, add_wrapped
+from discord.voice.utils.wrapped import add_wrapped
 from discord.voice.utils.buffer import JitterBuffer
 
 import davey
 
 from .errors import DiscordException
-from .sinks import RawData
 
 if TYPE_CHECKING:
     from discord.user import User

discord/sinks/core.py

@@ -71,15 +71,9 @@
 _log = logging.getLogger(__name__)
 
 
-class SinkBase:
-    """Represents an audio sink in which user's audios are stored.
-    """
-
-    __sink_listeners__: list[tuple[str, str]]
 
-    _client: VoiceClient | None
-
-    def __new__(cls) -> Self:
+class SinkMeta(type):
+    def __new__(cls, *args, **kwargs):
         listeners = {}
 
         for base in reversed(cls.__mro__):
@@ -102,7 +96,15 @@ def __new__(cls) -> Self:
                 listeners_list.append((listener_name, listener.__name__))
 
         cls.__sink_listeners__ = listeners_list
-        return super().__new__(cls)
+        return super().__new__(cls, *args, **kwargs)
+
+
+class SinkBase(metaclass=SinkMeta):
+    """Represents an audio sink in which user's audios are stored.
+    """
+
+    __sink_listeners__: list[tuple[str, str]]
+    _client: VoiceClient | None
 
     @property
     def root(self) -> Sink:
@@ -381,7 +383,7 @@ def __init__(
         options: str | None = None,
         error_hook: Callable[[Self, Exception, VoiceData | None], Any] | None = None,
     ) -> None:
-        super().__init__()
+        super().__init__(dest=None)
 
         if filename is not MISSING and buffer is not MISSING:
             raise TypeError("can't mix filename and buffer parameters")

discord/sinks/mp3.py

@@ -116,3 +116,4 @@ def __init__(
             options=options,
             error_hook=error_hook,
         )  # type: ignore
+        

discord/voice/client.py

@@ -33,6 +33,7 @@
 import warnings
 
 from discord import opus
+from discord.enums import SpeakingState, try_enum
 from discord.errors import ClientException
 from discord.player import AudioPlayer, AudioSource
 from discord.sinks.core import Sink
@@ -42,6 +43,7 @@
 from ._types import VoiceProtocol
 from .receive import AudioReader
 from .state import VoiceConnectionState
+from .enums import OpCodes
 
 if TYPE_CHECKING:
     from typing_extensions import ParamSpec
@@ -202,6 +204,68 @@ def checked_add(self, attr: str, value: int, limit: int) -> None:
     def create_connection_state(self) -> VoiceConnectionState:
         return VoiceConnectionState(self, hook=self._recv_hook)
 
+    async def _recv_hook(self, ws: VoiceWebSocket, msg: dict[str, Any]) -> None:
+        op = msg["op"]
+        data = msg.get("d", {})
+
+        if op == OpCodes.ready:
+            self._add_ssrc(self.guild.me.id, data["ssrc"])
+        elif op == OpCodes.speaking:
+            uid = int(data["user_id"])
+            ssrc = data["ssrc"]
+
+            self._add_ssrc(uid, ssrc)
+
+            member = self.guild.get_member(uid)
+            state = try_enum(SpeakingState, data["speaking"])
+            self.dispatch("member_speaking_state_update", member, ssrc, state)
+        elif op == OpCodes.clients_connect:
+            uids = list(map(int, data["user_ids"]))
+
+            for uid in uids:
+                member = self.guild.get_member(uid)
+                if not member:
+                    _log.warning("Skipping member referencing ID %d on member_connect", uid)
+                    continue
+                self.dispatch("member_connect", member)
+        elif op == OpCodes.client_disconnect:
+            uid = int(data["user_id"])
+            ssrc = self._id_to_ssrc.get(uid)
+
+            if self._reader and ssrc is not None:
+                _log.debug("Destroying decoder for user %d, ssrc=%d", uid, ssrc)
+                self._reader.packet_router.destroy_decoder(ssrc)
+
+            self._remove_ssrc(user_id=uid)
+            member = self.guild.get_member(uid)
+            self.dispatch("member_disconnect", member, ssrc)
+
+        # maybe handle video and such things?
+
+    async def _run_event(self, coro, event_name: str, *args: Any, **kwargs: Any) -> None:
+        try:
+            await coro(*args, **kwargs)
+        except asyncio.CancelledError:
+            pass
+        except Exception:
+            _log.exception("Error calling %s", event_name)
+
+    def _schedule_event(self, coro, event_name: str, *args: Any, **kwargs: Any) -> asyncio.Task:
+        wrapped = self._run_event(coro, event_name, *args, **kwargs)
+        return self.client.loop.create_task(wrapped, name=f"voice-receiver-event-dispatch: {event_name}")
+
+    def dispatch(self, event: str, /, *args: Any, **kwargs: Any) -> None:
+        _log.debug("Dispatching voice_client event %s", event)
+
+        event_name = f"on_{event}"
+        for coro in self._event_listeners.get(event_name, []):
+            task = self._schedule_event(coro, event_name, *args, **kwargs)
+            self._connection._dispatch_task_set.add(task)
+            task.add_done_callback(self._connection._dispatch_task_set.discard)
+
+        self._dispatch_sink(event, *args, **kwargs)
+        self.client.dispatch(event, *args, **kwargs)
+
     async def on_voice_state_update(self, data: RawVoiceStateUpdateEvent) -> None:
         old_channel_id = self.channel.id if self.channel else None
         await self._connection.voice_state_update(data)

discord/voice/packets/core.py

@@ -25,16 +25,9 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from discord.opus import Decoder, _lib
-
 if TYPE_CHECKING:
     from typing_extensions import Final
 
-if _lib is None:
-    DECODER = None
-else:
-    DECODER = Decoder()
-
 OPUS_SILENCE: Final = b'\xf8\xff\xfe'