mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-06-07 20:28:38 +00:00
Code Issues Projects Releases Wiki Activity

Change Guild.member_count to Optional[int]

Browse Source
This commit is contained in:
Alex Nørgaard 2022-03-10 04:06:07 +00:00 committed by GitHub
parent 9b65b5ce2e
commit 03687fb616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
discord/guild.py
View File

@ -450,9 +450,7 @@ class Guild(Hashable):
def _from_data(self, guild: GuildPayload) -> None: def _from_data(self, guild: GuildPayload) -> None:
# according to Stan, this is always available even if the guild is unavailable # according to Stan, this is always available even if the guild is unavailable
# I don't have this guarantee when someone updates the guild. # I don't have this guarantee when someone updates the guild.
member_count = guild.get('member_count', None) self._member_count: Optional[int] = guild.get('member_count', None)
if member_count is not None:
self._member_count: int = member_count
self.name: str = guild.get('name', '') self.name: str = guild.get('name', '')
self.verification_level: VerificationLevel = try_enum(VerificationLevel, guild.get('verification_level')) self.verification_level: VerificationLevel = try_enum(VerificationLevel, guild.get('verification_level'))
@ -514,7 +512,7 @@ class Guild(Hashable):
self._add_member(member) self._add_member(member)
self._sync(guild) self._sync(guild)
self._large: Optional[bool] = None if member_count is None else self._member_count >= 250 self._large: Optional[bool] = None if self._member_count is None else self._member_count >= 250
self.owner_id: Optional[int] = utils._get_as_snowflake(guild, 'owner_id') self.owner_id: Optional[int] = utils._get_as_snowflake(guild, 'owner_id')
self.afk_channel: Optional[VocalGuildChannel] = self.get_channel(utils._get_as_snowflake(guild, 'afk_channel_id')) # type: ignore self.afk_channel: Optional[VocalGuildChannel] = self.get_channel(utils._get_as_snowflake(guild, 'afk_channel_id')) # type: ignore
@ -966,14 +964,17 @@ class Guild(Hashable):
return Asset._from_guild_image(self._state, self.id, self._discovery_splash, path='discovery-splashes') return Asset._from_guild_image(self._state, self.id, self._discovery_splash, path='discovery-splashes')
@property @property
def member_count(self) -> int: def member_count(self) -> Optional[int]:
""":class:`int`: Returns the true member count regardless of it being loaded fully or not. """Optional[:class:`int`]: Returns the member count if available.
.. warning:: .. warning::
Due to a Discord limitation, in order for this attribute to remain up-to-date and Due to a Discord limitation, in order for this attribute to remain up-to-date and
accurate, it requires :attr:`Intents.members` to be specified. accurate, it requires :attr:`Intents.members` to be specified.
.. versionchanged:: 2.0
Now returns an ``Optional[int]``.
""" """
return self._member_count return self._member_count

1
docs/migrating.rst
View File

@ -929,6 +929,7 @@ The following changes have been made:
- :meth:`Guild.vanity_invite` may now be ``None``. This has been done to fix an issue with the method returning a broken :class:`Invite` object. - :meth:`Guild.vanity_invite` may now be ``None``. This has been done to fix an issue with the method returning a broken :class:`Invite` object.
- :attr:`Guild.shard_id` is now ``0`` instead of ``None`` if :class:`AutoShardedClient` is not used. - :attr:`Guild.shard_id` is now ``0`` instead of ``None`` if :class:`AutoShardedClient` is not used.
- :attr:`Guild.mfa_level` is now of type :class:`MFALevel`. - :attr:`Guild.mfa_level` is now of type :class:`MFALevel`.
- :attr:`Guild.member_count` is now of type Optional[:class:`int`].
- :attr:`AuditLogDiff.mfa_level` is now of type :class:`MFALevel`. - :attr:`AuditLogDiff.mfa_level` is now of type :class:`MFALevel`.
- :attr:`AuditLogDiff.rtc_region` is now of type :class:`str`. - :attr:`AuditLogDiff.rtc_region` is now of type :class:`str`.
- :attr:`StageChannel.rtc_region` is now of type :class:`str`. - :attr:`StageChannel.rtc_region` is now of type :class:`str`.