Skip to content

Commit 99cf7dd

Browse files
authored
Merge branch 'master' into unittest
2 parents 274de19 + 0ef62b8 commit 99cf7dd

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ These changes are available on the `master` branch, but have not yet been releas
4545
- `get_application_command()` now supports retrieving subcommands and subcommand groups.
4646
([#1678](https://github.com/Pycord-Development/pycord/pull/1678))
4747

48+
### Removed
49+
50+
- Removed the guild feature `PRIVATE_THREADS` due to paywall limitation removal.
51+
([#1789](https://github.com/Pycord-Development/pycord/pull/1789))
52+
4853
## [2.2.2] - 2022-10-05
4954

5055
### Fixed

discord/commands/context.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@ def message(self) -> Message | None:
201201
return self.interaction.message
202202

203203
@cached_property
204-
def user(self) -> Member | User | None:
204+
def user(self) -> Member | User:
205205
"""Returns the user that sent this context's command.
206206
Shorthand for :attr:`.Interaction.user`.
207207
"""
208-
return self.interaction.user
208+
return self.interaction.user # type: ignore # command user will never be None
209209

210-
author: Member | User | None = user
210+
author = user
211211

212212
@property
213213
def voice_client(self) -> VoiceProtocol | None:

discord/guild.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ class Guild(Hashable):
230230
- ``PARTNERED``: Guild is a partnered server.
231231
- ``PREMIUM_TIER_3_OVERRIDE``: Forces the server to server boosting level 3 (specifically created by Discord Staff Member "Jethro" for their personal server).
232232
- ``PREVIEW_ENABLED``: Guild can be viewed before being accepted via Membership Screening.
233-
- ``PRIVATE_THREADS``: Guild has access to create private threads.
234233
- ``ROLE_ICONS``: Guild can set an image or emoji as a role icon.
235234
- ``ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE``: Role subscriptions are available for purchasing.
236235
- ``ROLE_SUBSCRIPTIONS_ENABLED``: Guild is able to view and manage role subscriptions.

discord/interactions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class Interaction:
104104
application_id: :class:`int`
105105
The application ID that the interaction was for.
106106
user: Optional[Union[:class:`User`, :class:`Member`]]
107-
The user or member that sent the interaction.
107+
The user or member that sent the interaction. Will be `None` in PING interactions.
108108
message: Optional[:class:`Message`]
109109
The message that sent this interaction.
110110
token: :class:`str`

discord/types/guild.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ class UnavailableGuild(TypedDict):
7979
"PARTNERED",
8080
"PREMIUM_TIER_3_OVERRIDE",
8181
"PREVIEW_ENABLED",
82-
"PRIVATE_THREADS",
8382
"ROLE_ICONS",
8483
"ROLE_SUBSCRIPTIONS_ENABLED",
8584
"SEVEN_DAY_THREAD_ARCHIVE",

0 commit comments

Comments
 (0)