Skip to content

Commit

Permalink
Merge branch 'master' into feat/voice-messages
Browse files Browse the repository at this point in the history
  • Loading branch information
Lulalaby authored Apr 18, 2023
2 parents a93ff6d + 0407f28 commit 3352cc8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ These changes are available on the `master` branch, but have not yet been releas
- Fixed `AttributeError` caused by
[#1957](https://github.com/Pycord-Development/pycord/pull/1957) when using listeners
in cogs. ([#1989](https://github.com/Pycord-Development/pycord/pull/1989))
- Editing a webhook message if the thread is a forum post or if the thread is a private
thread ([#1981](https://github.com/Pycord-Development/pycord/pull/1981))
- Fixed `View.message` not being set when view is sent using webhooks, including
`Interaction.followup.send` or when a message is edited.
([#1997](https://github.com/Pycord-Development/pycord/pull/1997))
Expand Down
4 changes: 3 additions & 1 deletion discord/webhook/async_.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

from .. import utils
from ..asset import Asset
from ..channel import PartialMessageable
from ..channel import ForumChannel, PartialMessageable
from ..enums import WebhookType, try_enum
from ..errors import (
DiscordServerError,
Expand Down Expand Up @@ -892,6 +892,8 @@ async def edit(
thread = Object(self._thread_id)
elif isinstance(self.channel, Thread):
thread = Object(self.channel.id)
elif isinstance(self.channel, ForumChannel):
thread = Object(self.id)

if attachments is MISSING:
attachments = self.attachments or MISSING
Expand Down

0 comments on commit 3352cc8

Please sign in to comment.