okay this needs fixing

Author: DA-344

discord/opus.py

@@ -653,23 +653,30 @@ def _make_fakepacket(self) -> FakePacket:
 
     def _process_packet(self, packet: Packet) -> VoiceData:
         from discord.object import Object
+        from discord.voice import VoiceData
 
-        pcm = None
+        assert self.sink.client
 
-        if not self.sink.is_opus():
-            packet, pcm = self._decode_packet(packet)
+        pcm = None
 
         member = self._get_cached_member()
 
         if member is None:
-            self._cached_id = self.sink.client._connection._get_id_from_ssrc(self.ssrc)
+            self._cached_id = self.sink.client._ssrc_to_id.get(self.ssrc)
             member = self._get_cached_member()
+        else:
+            self._cached_id = member.id
 
         # yet still none, use Object
         if member is None and self._cached_id:
             member = Object(id=self._cached_id)
 
-        data = VoiceData(packet, member, pcm=pcm)
+        if not self.sink.is_opus():
+            _log.debug("Decoding packet %s (type %s)", packet, type(packet))
+            packet, pcm = self._decode_packet(packet)
+
+
+        data = VoiceData(packet, member, pcm=pcm)  # type: ignore
         self._last_seq = packet.sequence
         self._last_ts = packet.timestamp
         return data

discord/sinks/core.py

@@ -73,10 +73,14 @@
 
 
 class SinkMeta(type):
-    def __new__(cls, *args, **kwargs):
+    __sink_listeners__: list[tuple[str, str]]
+
+    def __new__(cls, name, bases, attr, **kwargs):
         listeners = {}
 
-        for base in reversed(cls.__mro__):
+        inst = super().__new__(cls, name, bases, attr, **kwargs)
+
+        for base in reversed(inst.__mro__):
             for elem, value in base.__dict__.items():
                 if elem in listeners:
                     del listeners[elem]
@@ -95,8 +99,8 @@ def __new__(cls, *args, **kwargs):
             for listener_name in listener.__sink_listener_names__:
                 listeners_list.append((listener_name, listener.__name__))
 
-        cls.__sink_listeners__ = listeners_list
-        return super().__new__(cls, *args, **kwargs)
+        inst.__sink_listeners__ = listeners_list
+        return inst
 
 
 class SinkBase(metaclass=SinkMeta):

discord/voice/client.py

@@ -585,7 +585,7 @@ def stop(self) -> None:
             for cb, _ in self._player_future._callbacks:
                 self._player_future.remove_done_callback(cb)
             self._player_future.set_result(None)
-        if self._reader:
+        if self._reader is not MISSING:
             self._reader.stop()
             self._reader = MISSING
 
@@ -733,7 +733,7 @@ def stop_recording(self) -> None:
         RecordingException
             You are not recording.
         """
-        if self._reader:
+        if self._reader is not MISSING:
             self._reader.stop()
             self._reader = MISSING
         else:

discord/voice/packets/rtp.py

@@ -204,6 +204,7 @@ def __init__(self, data: bytes) -> None:
 
         self.version: int = head >> 6
         self.padding: bool = bool(head & 0b00100000)
+        setattr(self, "report_count", head & 0b00011111)
 
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__} version={self.version} padding={self.padding} length={self.length}>"