Browse Source

Rename preferred_voice_regions

pull/10109/head
dolfies 2 years ago
parent
commit
c9416e33a6
  1. 10
      discord/client.py
  2. 2
      discord/guild.py
  3. 8
      discord/state.py

10
discord/client.py

@ -484,12 +484,16 @@ class Client:
return self._connection.country_code return self._connection.country_code
@property @property
def preferred_voice_regions(self) -> List[str]: def preferred_rtc_regions(self) -> List[str]:
"""List[:class:`str`]: Geo-ordered list of voice regions the connected client can use. """List[:class:`str`]: Geo-ordered list of voice regions the connected client can use.
.. versionadded:: 2.0 .. versionadded:: 2.0
.. versionchanged:: 2.1
Rename from ``preferred_voice_regions`` to ``preferred_rtc_regions``.
""" """
return self._connection.preferred_regions return self._connection.preferred_rtc_regions
@property @property
def pending_payments(self) -> Sequence[Payment]: def pending_payments(self) -> Sequence[Payment]:
@ -1632,7 +1636,7 @@ class Client:
if preferred_region is None or channel_id is None: if preferred_region is None or channel_id is None:
region = None region = None
else: else:
region = str(preferred_region) if preferred_region else state.preferred_region region = str(preferred_region) if preferred_region else state.preferred_rtc_region
await ws.voice_state(None, channel_id, self_mute, self_deaf, self_video, preferred_region=region) await ws.voice_state(None, channel_id, self_mute, self_deaf, self_video, preferred_region=region)

2
discord/guild.py

@ -4861,7 +4861,7 @@ class Guild(Hashable):
if preferred_region is None or channel_id is None: if preferred_region is None or channel_id is None:
region = None region = None
else: else:
region = str(preferred_region) if preferred_region else state.preferred_region region = str(preferred_region) if preferred_region else state.preferred_rtc_region
await ws.voice_state(self.id, channel_id, self_mute, self_deaf, self_video, preferred_region=region) await ws.voice_state(self.id, channel_id, self_mute, self_deaf, self_video, preferred_region=region)

8
discord/state.py

@ -606,7 +606,7 @@ class ConnectionState:
self.connections: Dict[str, Connection] = {} self.connections: Dict[str, Connection] = {}
self.pending_payments: Dict[int, Payment] = {} self.pending_payments: Dict[int, Payment] = {}
self.analytics_token: Optional[str] = None self.analytics_token: Optional[str] = None
self.preferred_regions: List[str] = [] self.preferred_rtc_regions: List[str] = []
self.country_code: Optional[str] = None self.country_code: Optional[str] = None
self.api_code_version: int = 0 self.api_code_version: int = 0
self.session_type: Optional[str] = None self.session_type: Optional[str] = None
@ -691,8 +691,8 @@ class ConnectionState:
return str(getattr(self.user, 'locale', 'en-US')) return str(getattr(self.user, 'locale', 'en-US'))
@property @property
def preferred_region(self) -> str: def preferred_rtc_region(self) -> str:
return self.preferred_regions[0] if self.preferred_regions else 'us-central' return self.preferred_rtc_regions[0] if self.preferred_rtc_regions else 'us-central'
@property @property
def voice_clients(self) -> List[VoiceProtocol]: def voice_clients(self) -> List[VoiceProtocol]:
@ -1046,7 +1046,7 @@ class ConnectionState:
# Extras # Extras
self.analytics_token = data.get('analytics_token') self.analytics_token = data.get('analytics_token')
self.preferred_regions = data.get('geo_ordered_rtc_regions', ['us-central']) self.preferred_rtc_regions = data.get('geo_ordered_rtc_regions', ['us-central'])
self.settings = UserSettings(self, data.get('user_settings_proto', '')) self.settings = UserSettings(self, data.get('user_settings_proto', ''))
self.guild_settings = { self.guild_settings = {
utils._get_as_snowflake(entry, 'guild_id'): GuildSettings(data=entry, state=self) utils._get_as_snowflake(entry, 'guild_id'): GuildSettings(data=entry, state=self)

Loading…
Cancel
Save