Skip to content

Commit 04f188c

Browse files
authored
Merge branch 'master' into fix/message-pins-types
2 parents 702bdb0 + 227a128 commit 04f188c

6 files changed

Lines changed: 20 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ These changes are available on the `master` branch, but have not yet been releas
1616

1717
### Fixed
1818

19+
- Fixed internal use of deprecated role type methods.
20+
([#3167](https://github.com/Pycord-Development/pycord/pull/3167))
1921
- Fixed a `TypeError` when using `Label.set_select` and not providing `default_values`.
2022
([#3171](https://github.com/Pycord-Development/pycord/pull/3171))
2123
- Fixed `View.from_dict()` incorrectly returning `None`.
2224
([#3181](https://github.com/Pycord-Development/pycord/pull/3181))
25+
- Fixed internal use of deprecated \_PayloadLike dict operations.
26+
([#3189](https://github.com/Pycord-Development/pycord/pull/3189))
2327

2428
### Deprecated
2529

discord/guild.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
NotificationLevel,
6262
NSFWLevel,
6363
OnboardingMode,
64+
RoleType,
6465
ScheduledEventLocationType,
6566
ScheduledEventPrivacyLevel,
6667
SortOrder,
@@ -1250,7 +1251,7 @@ def premium_subscriber_role(self) -> Role | None:
12501251
.. versionadded:: 1.6
12511252
"""
12521253
for role in self._roles.values():
1253-
if role.is_premium_subscriber():
1254+
if role.type is RoleType.BOOSTER:
12541255
return role
12551256
return None
12561257

discord/role.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ def is_bot_managed(self) -> bool:
572572
573573
.. versionadded:: 1.6
574574
"""
575-
return self.tags is not None and self.tags.is_bot_managed()
575+
return self.type is RoleType.APPLICATION
576576

577577
@deprecated(
578578
"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:
585585
586586
.. versionadded:: 1.6
587587
"""
588-
return self.tags is not None and self.tags.is_premium_subscriber()
588+
return self.type is RoleType.BOOSTER
589589

590590
@deprecated(
591591
"Role.is_integration is deprecated since version 2.8, consider using Role.type instead."
@@ -599,7 +599,11 @@ def is_integration(self) -> bool:
599599
600600
.. versionadded:: 1.6
601601
"""
602-
return self.tags is not None and self.tags.is_integration()
602+
return self.type in (
603+
RoleType.INTEGRATION,
604+
RoleType.PREMIUM_SUBSCRIPTION_TIER,
605+
RoleType.DRAFT_PREMIUM_SUBSCRIPTION_TIER,
606+
)
603607

604608
def is_assignable(self) -> bool:
605609
"""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:
639643
640644
.. versionadded:: 2.7
641645
"""
642-
return self.tags is not None and self.tags.is_available_for_purchase()
646+
return self.type is RoleType.PREMIUM_SUBSCRIPTION_TIER
643647

644648
@deprecated(
645649
"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:
652656
653657
.. versionadded:: 2.7
654658
"""
655-
return self.tags is not None and self.tags.is_guild_connections_role()
659+
return self.type is RoleType.CONNECTION
656660

657661
@property
658662
def permissions(self) -> Permissions:

discord/voice/state.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ async def voice_state_update(self, data: RawVoiceStateUpdateEvent) -> None:
346346
await self.disconnect()
347347
return
348348

349-
self.session_id = data["session_id"]
349+
self.session_id = data.session_id
350350

351351
if self.state in (
352352
ConnectionFlowState.set_guild_voice_state,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ voice = { file = "requirements/voice.txt" }
6868
[dependency-groups]
6969
dev = [
7070
"pylint~=3.3.8",
71-
"mypy~=1.19.1",
71+
"mypy~=1.20.0",
7272
"coverage~=7.10",
7373
"pre-commit==4.5.1",
7474
"codespell==2.4.2",

renovate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
"assigneesFromCodeOwners": true,
1010
"pip_requirements": {
1111
"managerFilePatterns": ["requirements/*.txt"]
12+
},
13+
"github-actions": {
14+
"pinDigests": true
1215
}
1316
}

0 commit comments

Comments
 (0)