merge upstream

Author: DA-344

discord/client.py

@@ -27,7 +27,6 @@
 
 import asyncio
 import logging
-import signal
 import sys
 import traceback
 from types import TracebackType
@@ -467,7 +466,7 @@ def _schedule_event(
         return task
 
     def dispatch(self, event: str, *args: Any, **kwargs: Any) -> None:
-        logging.getLogger('discord.state').debug("Dispatching event %s", event)
+        logging.getLogger("discord.state").debug("Dispatching event %s", event)
         method = f"on_{event}"
 
         listeners = self._listeners.get(event)

discord/player.py

@@ -36,14 +36,14 @@
 import sys
 import threading
 import time
-import traceback
 from math import floor
 from typing import IO, TYPE_CHECKING, Any, Callable, Generic, TypeVar
 
-from .errors import ClientException
 from .enums import SpeakingState
+from .errors import ClientException
 from .oggparse import OggStream
-from .opus import Encoder as OpusEncoder, OPUS_SILENCE
+from .opus import OPUS_SILENCE
+from .opus import Encoder as OpusEncoder
 from .utils import MISSING
 
 if TYPE_CHECKING:
@@ -766,13 +766,13 @@ def _do_run(self) -> None:
 
             # are we disconnected from voice?
             if not client.is_connected():
-                _log.debug('Not connected, waiting for %ss...', client.timeout)
+                _log.debug("Not connected, waiting for %ss...", client.timeout)
                 # wait until we are connected, but not forever
                 connected = client.wait_until_connected(client.timeout)
                 if self._end.is_set() or not connected:
-                    _log.debug('Aborting playback')
+                    _log.debug("Aborting playback")
                     return
-                _log.debug('Reconnected, resuming playback')
+                _log.debug("Reconnected, resuming playback")
                 self._speak(SpeakingState.voice)
                 # reset our internal data
                 self.loops = 0

discord/voice/client.py

@@ -34,11 +34,12 @@
 
 from discord import opus
 from discord.errors import ClientException
+from discord.player import AudioPlayer, AudioSource
 from discord.utils import MISSING
-from discord.player import AudioSource, AudioPlayer
 
 from ._types import VoiceProtocol
-#from .recorder import VoiceRecorderClient
+
+# from .recorder import VoiceRecorderClient
 from .state import VoiceConnectionState
 
 if TYPE_CHECKING:
@@ -134,8 +135,8 @@ def __init__(
         self._connection: VoiceConnectionState = self.create_connection_state()
 
         # voice recv things
-        #self._recorder: VoiceRecorderClient | None = None
-        #if use_recorder:
+        # self._recorder: VoiceRecorderClient | None = None
+        # if use_recorder:
         #    self._recorder = VoiceRecorderClient(self)
 
     warn_nacl: bool = not has_nacl
@@ -551,10 +552,10 @@ def source(self) -> AudioSource | None:
     @source.setter
     def source(self, value: AudioSource) -> None:
         if not isinstance(value, AudioSource):
-            raise TypeError(f'expected AudioSource, not {value.__class__.__name__}')
+            raise TypeError(f"expected AudioSource, not {value.__class__.__name__}")
 
         if self._player is None:
-            raise ValueError('the client is not playing anything')
+            raise ValueError("the client is not playing anything")
 
         self._player._set_source(value)
 
@@ -578,7 +579,7 @@ def send_audio_packet(self, data: bytes, *, encode: bool = True) -> None:
             Encoding the data failed.
         """
 
-        self.checked_add('sequence', 1, 65535)
+        self.checked_add("sequence", 1, 65535)
         if encode:
             encoded = self.encoder.encode(data, self.encoder.SAMPLES_PER_FRAME)
         else:
@@ -588,9 +589,13 @@ def send_audio_packet(self, data: bytes, *, encode: bool = True) -> None:
         try:
             self._connection.send_packet(packet)
         except OSError:
-            _log.debug('A packet has been dropped (seq: %s, timestamp: %s)', self.sequence, self.timestamp)
+            _log.debug(
+                "A packet has been dropped (seq: %s, timestamp: %s)",
+                self.sequence,
+                self.timestamp,
+            )
 
-        self.checked_add('timestamp', opus.Encoder.SAMPLES_PER_FRAME, 4294967295)
+        self.checked_add("timestamp", opus.Encoder.SAMPLES_PER_FRAME, 4294967295)
 
     def elapsed(self) -> datetime.timedelta:
         """Returns the elapsed time of the playing audio."""

discord/voice/gateway.py

@@ -205,29 +205,29 @@ async def ready(self, data: dict[str, Any]) -> None:
         )
 
         _log.debug(
-            'Connected socket to %s (port %s)',
+            "Connected socket to %s (port %s)",
             state.endpoint_ip,
             state.voice_port,
         )
 
         state.ip, state.port = await self.get_ip()
 
-        modes = [mode for mode in data['modes'] if mode in self.state.supported_modes]
-        _log.debug('Received available voice connection modes: %s', modes)
+        modes = [mode for mode in data["modes"] if mode in self.state.supported_modes]
+        _log.debug("Received available voice connection modes: %s", modes)
 
         mode = modes[0]
         await self.select_protocol(state.ip, state.port, mode)
-        _log.debug('Selected voice protocol %s for this connection', mode)
+        _log.debug("Selected voice protocol %s for this connection", mode)
 
     async def select_protocol(self, ip: str, port: int, mode: str) -> None:
         payload = {
-            'op': int(OpCodes.select_protocol),
-            'd': {
-                'protocol': 'udp',
-                'data': {
-                    'address': ip,
-                    'port': port,
-                    'mode': mode,
+            "op": int(OpCodes.select_protocol),
+            "d": {
+                "protocol": "udp",
+                "data": {
+                    "address": ip,
+                    "port": port,
+                    "mode": mode,
                 },
             },
         }
@@ -346,12 +346,12 @@ async def from_state(
     async def identify(self) -> None:
         state = self.state
         payload = {
-            'op': int(OpCodes.identify),
-            'd': {
-                'server_id': str(state.server_id),
-                'user_id': str(state.user.id),
-                'session_id': self.session_id,
-                'token': self.token,
+            "op": int(OpCodes.identify),
+            "d": {
+                "server_id": str(state.server_id),
+                "user_id": str(state.user.id),
+                "session_id": self.session_id,
+                "token": self.token,
             },
         }
         await self.send_as_json(payload)

discord/voice/recorder.py

@@ -39,7 +39,7 @@
     from .client import VoiceClient
     from .gateway import VoiceWebSocket
 
-    VoiceClientT = TypeVar('VoiceClientT', bound=VoiceClient, covariant=True)
+    VoiceClientT = TypeVar("VoiceClientT", bound=VoiceClient, covariant=True)
 
 
 class VoiceRecorderClient(VoiceRecorderProtocol[VoiceClientT]):
@@ -67,11 +67,9 @@ def is_recording(self) -> bool:
         """Whether the current recording is actively recording."""
         return self._recording.is_set()
 
-    async def hook(self, ws: VoiceWebSocket, data: dict[str, Any]) -> None:
-        ...
+    async def hook(self, ws: VoiceWebSocket, data: dict[str, Any]) -> None: ...
 
     def record(
         self,
         sink: Sink,
-    ) -> int:
-        ...
+    ) -> int: ...

discord/voice/state.py

@@ -479,7 +479,11 @@ async def disconnect(
         if not force and not self.is_connected():
             return
 
-        _log.debug('Attempting a voice disconnect for channel %s (guild %s)', self.channel_id, self.guild_id)
+        _log.debug(
+            "Attempting a voice disconnect for channel %s (guild %s)",
+            self.channel_id,
+            self.guild_id,
+        )
         try:
             await self._voice_disconnect()
             if self.ws: