diff --git a/CHANGELOG.md b/CHANGELOG.md index 4209b0dbb0..2a4ba2bf50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ These changes are available on the `master` branch, but have not yet been releas ### Fixed +- Fixed internal use of deprecated role type methods. + ([#3167](https://github.com/Pycord-Development/pycord/pull/3167)) - Fixed a `TypeError` when using `Label.set_select` and not providing `default_values`. ([#3171](https://github.com/Pycord-Development/pycord/pull/3171)) diff --git a/discord/guild.py b/discord/guild.py index 63ba4aee5a..4ecbfe57bd 100644 --- a/discord/guild.py +++ b/discord/guild.py @@ -61,6 +61,7 @@ NotificationLevel, NSFWLevel, OnboardingMode, + RoleType, ScheduledEventLocationType, ScheduledEventPrivacyLevel, SortOrder, @@ -1250,7 +1251,7 @@ def premium_subscriber_role(self) -> Role | None: .. versionadded:: 1.6 """ for role in self._roles.values(): - if role.is_premium_subscriber(): + if role.type is RoleType.BOOSTER: return role return None diff --git a/discord/role.py b/discord/role.py index aa41896c85..0508a87671 100644 --- a/discord/role.py +++ b/discord/role.py @@ -572,7 +572,7 @@ def is_bot_managed(self) -> bool: .. versionadded:: 1.6 """ - return self.tags is not None and self.tags.is_bot_managed() + return self.type is RoleType.APPLICATION @deprecated( "Role.is_premium_subscriber is deprecated since version 2.8, consider using Role.type instead." @@ -585,7 +585,7 @@ def is_premium_subscriber(self) -> bool: .. versionadded:: 1.6 """ - return self.tags is not None and self.tags.is_premium_subscriber() + return self.type is RoleType.BOOSTER @deprecated( "Role.is_integration is deprecated since version 2.8, consider using Role.type instead." @@ -599,7 +599,11 @@ def is_integration(self) -> bool: .. versionadded:: 1.6 """ - return self.tags is not None and self.tags.is_integration() + return self.type in ( + RoleType.INTEGRATION, + RoleType.PREMIUM_SUBSCRIPTION_TIER, + RoleType.DRAFT_PREMIUM_SUBSCRIPTION_TIER, + ) def is_assignable(self) -> bool: """Whether the role is able to be assigned or removed by the bot. This checks whether all of the following conditions are true: @@ -639,7 +643,7 @@ def is_available_for_purchase(self) -> bool: .. versionadded:: 2.7 """ - return self.tags is not None and self.tags.is_available_for_purchase() + return self.type is RoleType.PREMIUM_SUBSCRIPTION_TIER @deprecated( "Role.is_guild_connections_role is deprecated since version 2.8, consider using Role.type instead." @@ -652,7 +656,7 @@ def is_guild_connections_role(self) -> bool: .. versionadded:: 2.7 """ - return self.tags is not None and self.tags.is_guild_connections_role() + return self.type is RoleType.CONNECTION @property def permissions(self) -> Permissions: