From 80f18813424437c23942d158df038372045e22d5 Mon Sep 17 00:00:00 2001 From: dolfies Date: Sun, 1 Dec 2024 08:29:01 -0500 Subject: [PATCH] Fix pyright errors --- discord/settings.py | 3 +-- discord/types/gateway.py | 2 +- discord/types/voice.py | 13 ++++++++++--- discord/voice_client.py | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/discord/settings.py b/discord/settings.py index ddadcc8bc..3643a98d2 100644 --- a/discord/settings.py +++ b/discord/settings.py @@ -150,10 +150,9 @@ class _ProtoSettings: return self._state._get_or_create_unavailable_guild(id) return self._state._get_guild(id) or Object(id=id) - def to_dict(self, *, with_defaults: bool = False) -> Dict[str, Any]: + def to_dict(self) -> Dict[str, Any]: return MessageToDict( self.settings, - always_print_fields_with_no_presence=with_defaults, preserving_proto_field_name=True, use_integers_for_enums=True, ) diff --git a/discord/types/gateway.py b/discord/types/gateway.py index 2615fd4af..fb200c20b 100644 --- a/discord/types/gateway.py +++ b/discord/types/gateway.py @@ -35,7 +35,7 @@ from .channel import ChannelType, DMChannel, GroupDMChannel, StageInstance from .emoji import Emoji, PartialEmoji from .entitlements import Entitlement, GatewayGift from .experiment import GuildExperiment, UserExperiment -from .guild import ApplicationCommandCounts, Guild, SupplementalGuild, UnavailableGuild +from .guild import Guild, SupplementalGuild, UnavailableGuild from .integration import BaseIntegration, IntegrationApplication from .interactions import Modal from .invite import _InviteTargetType diff --git a/discord/types/voice.py b/discord/types/voice.py index 393dc863a..2eb9f7cbe 100644 --- a/discord/types/voice.py +++ b/discord/types/voice.py @@ -29,8 +29,15 @@ from .snowflake import Snowflake from .member import MemberWithUser -SupportedModes = Literal['xsalsa20_poly1305_lite', 'xsalsa20_poly1305_suffix', 'xsalsa20_poly1305'] - +TransportEncryptionModes = Literal[ + 'aead_aes256_gcm_rtpsize', + 'aead_xchacha20_poly1305_rtpsize', + 'xsalsa20_poly1305_lite_rtpsize', + 'aead_aes256_gcm', + 'xsalsa20_poly1305', + 'xsalsa20_poly1305_suffix', + 'xsalsa20_poly1305_lite', +] class BaseVoiceState(TypedDict): user_id: Snowflake @@ -84,5 +91,5 @@ class VoiceReady(TypedDict): ssrc: int ip: str port: int - modes: List[SupportedModes] + modes: List[TransportEncryptionModes] heartbeat_interval: int diff --git a/discord/voice_client.py b/discord/voice_client.py index 96946601a..a67af9f41 100644 --- a/discord/voice_client.py +++ b/discord/voice_client.py @@ -64,7 +64,7 @@ if TYPE_CHECKING: from .types.gateway import VoiceStateUpdateEvent as VoiceStateUpdatePayload from .types.voice import ( VoiceServerUpdate as VoiceServerUpdatePayload, - SupportedModes, + TransportEncryptionModes, ) VocalChannel = abc.VocalChannel @@ -264,11 +264,11 @@ class VoiceClient(VoiceProtocol): self.ws: DiscordVoiceWebSocket = MISSING warn_nacl: bool = not has_nacl - supported_modes: Tuple[SupportedModes, ...] = ( + supported_modes: Tuple[TransportEncryptionModes, ...] = ( + 'aead_xchacha20_poly1305_rtpsize', 'xsalsa20_poly1305_lite', 'xsalsa20_poly1305_suffix', 'xsalsa20_poly1305', - 'aead_xchacha20_poly1305_rtpsize', ) @property