diff --git a/discord/client.py b/discord/client.py index 22745f6a9..462eb5536 100644 --- a/discord/client.py +++ b/discord/client.py @@ -484,12 +484,16 @@ class Client: return self._connection.country_code @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. .. 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 def pending_payments(self) -> Sequence[Payment]: @@ -1632,7 +1636,7 @@ class Client: if preferred_region is None or channel_id is None: region = None 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) diff --git a/discord/guild.py b/discord/guild.py index 2f60e216d..360938418 100644 --- a/discord/guild.py +++ b/discord/guild.py @@ -4861,7 +4861,7 @@ class Guild(Hashable): if preferred_region is None or channel_id is None: region = None 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) diff --git a/discord/state.py b/discord/state.py index 470cb4ef9..d3714e916 100644 --- a/discord/state.py +++ b/discord/state.py @@ -606,7 +606,7 @@ class ConnectionState: self.connections: Dict[str, Connection] = {} self.pending_payments: Dict[int, Payment] = {} self.analytics_token: Optional[str] = None - self.preferred_regions: List[str] = [] + self.preferred_rtc_regions: List[str] = [] self.country_code: Optional[str] = None self.api_code_version: int = 0 self.session_type: Optional[str] = None @@ -691,8 +691,8 @@ class ConnectionState: return str(getattr(self.user, 'locale', 'en-US')) @property - def preferred_region(self) -> str: - return self.preferred_regions[0] if self.preferred_regions else 'us-central' + def preferred_rtc_region(self) -> str: + return self.preferred_rtc_regions[0] if self.preferred_rtc_regions else 'us-central' @property def voice_clients(self) -> List[VoiceProtocol]: @@ -1046,7 +1046,7 @@ class ConnectionState: # Extras 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.guild_settings = { utils._get_as_snowflake(entry, 'guild_id'): GuildSettings(data=entry, state=self)