things

Author: DA-344

discord/abc.py

@@ -1934,6 +1934,7 @@ class Connectable(Protocol):
 
     __slots__ = ()
     _state: ConnectionState
+    id: int
 
     def _get_voice_client_key(self) -> tuple[int, str]:
         raise NotImplementedError

discord/channel.py

@@ -1611,7 +1611,7 @@ def _update(
         self, guild: Guild, data: VoiceChannelPayload | StageChannelPayload
     ) -> None:
         # This data will always exist
-        self.guild = guild
+        self.guild: Guild = guild
         self.name: str = data["name"]
         self.category_id: int | None = utils._get_as_snowflake(data, "parent_id")
 

discord/gateway.py

@@ -137,11 +137,17 @@ def __init__(
         interval: float | None = None,
         **kwargs: Any,
     ) -> None:
-        threading.Thread.__init__(self, *args, **kwargs)
+        daemon: bool = kwargs.pop('daemon', True)
+        name: str = kwargs.pop('name', f'keep-alive-handler:shard-{shard_id}')
+        super().__init__(
+            *args,
+            **kwargs,
+            daemon=daemon,
+            name=name,
+        )
         self.ws: DiscordWebSocket = ws
         self._main_thread_id = ws.thread_id
         self.interval = interval
-        self.daemon = True
         self.shard_id = shard_id
         self.msg = "Keeping shard ID %s websocket alive with sequence %s."
         self.block_msg = "Shard ID %s heartbeat blocked for more than %s seconds."
@@ -153,7 +159,7 @@ def __init__(
         self.latency = float("inf")
         self.heartbeat_timeout = ws._max_heartbeat_timeout
 
-    def run(self):
+    def run(self) -> None:
         while not self._stop_ev.wait(self.interval):
             if self._last_recv + self.heartbeat_timeout < time.perf_counter():
                 _log.warning(
@@ -206,16 +212,16 @@ def run(self):
             else:
                 self._last_send = time.perf_counter()
 
-    def get_payload(self):
+    def get_payload(self) -> dict[str, Any]:
         return {"op": self.ws.HEARTBEAT, "d": self.ws.sequence}
 
-    def stop(self):
+    def stop(self) -> None:
         self._stop_ev.set()
 
-    def tick(self):
+    def tick(self) -> None:
         self._last_recv = time.perf_counter()
 
-    def ack(self):
+    def ack(self) -> None:
         ack_time = time.perf_counter()
         self._last_ack = ack_time
         self.latency = ack_time - self._last_send

discord/member.py

@@ -51,8 +51,9 @@
 )
 
 if TYPE_CHECKING:
+    from .client import Client
     from .abc import Snowflake
-    from .channel import DMChannel, StageChannel, VoiceChannel
+    from .channel import DMChannel, VocalGuildChannel
     from .flags import PublicUserFlags
     from .guild import Guild
     from .message import Message
@@ -63,11 +64,9 @@
     from .types.member import MemberWithUser as MemberWithUserPayload
     from .types.member import UserWithMember as UserWithMemberPayload
     from .types.user import User as UserPayload
-    from .types.voice import GuildVoiceState as GuildVoiceStatePayload
+    from .types.voice import VoiceState as GuildVoiceStatePayload
     from .types.voice import VoiceState as VoiceStatePayload
 
-    VocalGuildChannel = Union[VoiceChannel, StageChannel]
-
 
 class VoiceState:
     """Represents a Discord user's voice state.
@@ -165,6 +164,20 @@ def __repr__(self) -> str:
         inner = " ".join("%s=%r" % t for t in attrs)
         return f"<{self.__class__.__name__} {inner}>"
 
+    @classmethod
+    def _create_default(cls, channel: VocalGuildChannel, client: Client) -> VoiceState:
+        self = cls(
+            data={
+                'channel_id': channel.id,
+                'guild_id': channel.guild.id,
+                'self_deaf': False,
+                'self_mute': False,
+                'user_id': client._connection.self_id,  # type: ignore
+            },
+            channel=channel,
+        )
+        return self
+
 
 def flatten_user(cls):
     for attr, value in itertools.chain(

discord/voice/client.py

@@ -24,31 +24,5 @@
 """
 from __future__ import annotations
 
-from ._types import VoiceProtocol
-
-
-class VoiceClient(VoiceProtocol):
-    """Represents a Discord voice connection.
-
-    You do not create these, you typically get them from e.g. :meth:`VoiceChannel.connect`.
-
-    Attributes
-    ----------
-    session_id: :class:`str`
-        The voice connection session ID. You should not share this.
-    token: :class:`str`
-        The voice connection token. You should not share this.
-    endpoint: :class:`str`
-        The endpoint the current client is connected to.
-    channel: :class:`abc.Connectable`
-        The voice channel connected to.
-    loop: :class:`asyncio.AbstractEventLoop`
-        The event loop that the voice client is running on.
-
-    Warning
-    -------
-    In order to use PCM based AudioSources, you must have the opus library
-    installed on your system and loaded through :func:`opus.load_opus`.
-    Otherwise, your AudioSources must be opus encoded (e.g. using :class:`FFmpegOpusAudio`)
-    or the library will not be able to transmit audio.
-    """
+# rn this is for typing, will be moved here in some point in the future
+from discord.voice_client import VoiceClient

discord/voice/enums.py

@@ -0,0 +1,54 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 Rapptz
+Copyright (c) 2021-present Pycord Development
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+"""
+from __future__ import annotations
+
+from discord.enums import Enum
+
+
+class OpCodes(Enum):
+    # fmt: off
+    identify            = 0
+    select_protocol     = 1
+    ready               = 2
+    heartbeat           = 3
+    session_description = 4
+    speaking            = 5
+    heartbeat_ack       = 6
+    resume              = 7
+    hello               = 8
+    resumed             = 9
+    client_connect      = 10
+    client_disconnect   = 11
+    # fmt: on
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, int):
+            return self.value == other
+        elif isinstance(other, self.__class__):
+            return self is other
+        return NotImplemented
+
+    def __int__(self) -> int:
+        return self.value