Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ These changes are available on the `master` branch, but have not yet been releas
([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
- Fixed `Subscription.renewal_sku_ids` not accepting `None` from the received payload.
([#2709](https://github.com/Pycord-Development/pycord/pull/2709))
- Fixed `ForumChannel.edit` allowing `default_reaction_emoji` to be `None`
([#2739](https://github.com/Pycord-Development/pycord/pull/2739))

### Changed

Expand Down
6 changes: 5 additions & 1 deletion discord/abc.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,13 +521,17 @@ async def _edit(
)
elif isinstance(default_reaction_emoji, str):
default_reaction_emoji = PartialEmoji.from_str(default_reaction_emoji)
elif default_reaction_emoji is None:
pass
else:
raise InvalidArgument(
"default_reaction_emoji must be of type: GuildEmoji | int | str"
"default_reaction_emoji must be of type: GuildEmoji | int | str | None"
)

options["default_reaction_emoji"] = (
default_reaction_emoji._to_forum_reaction_payload()
if default_reaction_emoji
else None
)

if options:
Expand Down