matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

add support for delete_message for interaction messages.

Browse Source
This commit is contained in:
Ethan Olchik 2021-09-28 13:20:43 +01:00
parent 3260ec6643
commit b3aa87582f
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
discord/ext/commands/context.py
View File

@ -465,7 +465,6 @@ class Context(discord.abc.Messageable, Generic[BotT]):
kwargs.pop("nonce", None)
kwargs.pop("stickers", None)
kwargs.pop("reference", None)
kwargs.pop("delete_after", None)
kwargs.pop("mention_author", None)
if not (

20
discord/interactions.py
View File

@ -337,7 +337,7 @@ class Interaction:
self._state.store_view(view, message.id)
return message
async def delete_original_message(self) -> None:
async def delete_original_message(self, delay: Optional[float] = None) -> None:
"""|coro|
Deletes the original interaction response message.
@ -345,6 +345,12 @@ class Interaction:
This is a lower level interface to :meth:`InteractionMessage.delete` in case
you do not want to fetch the message and save an HTTP request.
Parameters
------------
delay: Optional[:class:`float`]
If provided, the number of seconds to wait before deleting the message.
The waiting is done in the background and deletion failures are ignored.
Raises
-------
HTTPException
@ -352,6 +358,8 @@ class Interaction:
Forbidden
Deleted a message that is not yours.
"""
if delay is not None:
await asyncio.sleep(delay)
adapter = async_context.get()
await adapter.delete_original_interaction_response(
self.application_id,
@ -460,6 +468,7 @@ class InteractionResponse:
view: View = MISSING,
tts: bool = False,
ephemeral: bool = False,
delete_after: Optional[float] = None,
) -> None:
"""|coro|
@ -483,6 +492,8 @@ class InteractionResponse:
Indicates if the message should only be visible to the user who started the interaction.
If a view is sent with an ephemeral message and it has no timeout set then the timeout
is set to 15 minutes.
delete_after: Optional[:class:`float`]
The amount of seconds the bot should wait before deleting the message sent.
Raises
-------
@ -539,6 +550,8 @@ class InteractionResponse:
self._parent._state.store_view(view)
self.responded_at = utils.utcnow()
if delete_after is not None:
self._parent.delete_original_message(delay=delete_after)
async def edit_message(
self,
@ -757,12 +770,11 @@ class InteractionMessage(Message):
if delay is not None:
async def inner_call(delay: float = delay):
await asyncio.sleep(delay)
try:
await self._state._interaction.delete_original_message()
await self._state._interaction.delete_original_message(delay=delay)
except HTTPException:
pass
asyncio.create_task(inner_call())
else:
await self._state._interaction.delete_original_message()
await self._state._interaction.delete_original_message(delay=delay)

22
discord/webhook/async_.py
View File

@ -741,15 +741,14 @@ class WebhookMessage(Message):
if delay is not None:
async def inner_call(delay: float = delay):
await asyncio.sleep(delay)
try:
await self._state._webhook.delete_message(self.id)
await self._state._webhook.delete_message(self.id, delay=delay)
except HTTPException:
pass
asyncio.create_task(inner_call())
else:
await self._state._webhook.delete_message(self.id)
await self._state._webhook.delete_message(self.id, delay=delay)
class BaseWebhook(Hashable):
@ -1270,6 +1269,7 @@ class Webhook(BaseWebhook):
view: View = MISSING,
thread: Snowflake = MISSING,
wait: bool = False,
delete_after: Optional[float] = None,
) -> Optional[WebhookMessage]:
"""|coro|
@ -1335,6 +1335,10 @@ class Webhook(BaseWebhook):
The thread to send this webhook to.
.. versionadded:: 2.0
delete_after: Optional[:class:`float`]
If provided, the number of seconds to wait before deleting the message.
The waiting is done in the background and deletion failures are ignored.
Raises
--------
@ -1416,6 +1420,9 @@ class Webhook(BaseWebhook):
if view is not MISSING and not view.is_finished():
message_id = None if msg is None else msg.id
self._state.store_view(view, message_id)
if delete_after is not None and msg is not None:
await msg.delete(delay=delete_after)
return msg
@ -1570,7 +1577,7 @@ class Webhook(BaseWebhook):
self._state.store_view(view, message_id)
return message
async def delete_message(self, message_id: int, /) -> None:
async def delete_message(self, message_id: int, delay: Optional[float] = None, /) -> None:
"""|coro|
Deletes a message owned by this webhook.
@ -1584,6 +1591,10 @@ class Webhook(BaseWebhook):
------------
message_id: :class:`int`
The message ID to delete.
delay: Optional[:class:`float`]
If provided, the number of seconds to wait before deleting the message.
The waiting is done in the background and deletion failures are ignored.
Raises
-------
@ -1595,6 +1606,9 @@ class Webhook(BaseWebhook):
if self.token is None:
raise InvalidArgument("This webhook does not have a token associated with it")
if delay is not None:
await asyncio.sleep(delay)
adapter = async_context.get()
await adapter.delete_webhook_message(
self.id,