Merge pull request #600 from Makiyu-py/566-impl

Add delay and delete_after Parameters on Interaction functions

Author: Lulalaby

discord/interactions.py

@@ -280,6 +280,7 @@ async def edit_original_message(
         files: List[File] = MISSING,
         view: Optional[View] = MISSING,
         allowed_mentions: Optional[AllowedMentions] = None,
+        delete_after: Optional[float] = None,
     ) -> InteractionMessage:
         """|coro|
 
@@ -311,6 +312,10 @@ async def edit_original_message(
         view: Optional[:class:`~discord.ui.View`]
             The updated view to update this message with. If ``None`` is passed then
             the view is removed.
+        delete_after: Optional[:class:`float`]
+            If provided, the number of seconds to wait in the background
+            before deleting the message we just edited. If the deletion fails,
+            then it is silently ignored.
 
         Raises
         -------
@@ -354,16 +359,26 @@ async def edit_original_message(
         message = InteractionMessage(state=self._state, channel=self.channel, data=data)  # type: ignore
         if view and not view.is_finished():
             self._state.store_view(view, message.id)
+
+        if delete_after is not None:
+            await self.delete_original_message(delay=delete_after)
+
         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.
 
         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
@@ -372,12 +387,17 @@ async def delete_original_message(self) -> None:
             Deleted a message that is not yours.
         """
         adapter = async_context.get()
-        await adapter.delete_original_interaction_response(
+        func = adapter.delete_original_interaction_response(
             self.application_id,
             self.token,
             session=self._session,
         )
 
+        if delay is not None:
+            utils.delay_task(delay, func)
+        else:
+            await func
+
 
 class InteractionResponse:
     """Represents a Discord interaction response.
@@ -608,10 +628,7 @@ async def send_message(
 
         self._responded = True
         if delete_after is not None:
-            async def delete():
-                await asyncio.sleep(delete_after)
-                await self._parent.delete_original_message()
-            asyncio.ensure_future(delete(), loop=self._parent._state.loop)
+            await self._parent.delete_original_message(delay=delete_after)
         return self._parent
 
     async def edit_message(
@@ -622,6 +639,7 @@ async def edit_message(
         embeds: List[Embed] = MISSING,
         attachments: List[Attachment] = MISSING,
         view: Optional[View] = MISSING,
+        delete_after: Optional[float] = None
     ) -> None:
         """|coro|
 
@@ -643,6 +661,10 @@ async def edit_message(
         view: Optional[:class:`~discord.ui.View`]
             The updated view to update this message with. If ``None`` is passed then
             the view is removed.
+        delete_after: Optional[:class:`float`]
+            If provided, the number of seconds to wait in the background
+            before deleting the message we just edited. If the deletion fails,
+            then it is silently ignored.
 
         Raises
         -------
@@ -705,6 +727,8 @@ async def edit_message(
             state.store_view(view, message_id)
 
         self._responded = True
+        if delete_after is not None:
+            await self._parent.delete_original_message(delay=delete_after)
 
     async def send_autocomplete_result(
         self,
@@ -797,6 +821,7 @@ async def edit(
         files: List[File] = MISSING,
         view: Optional[View] = MISSING,
         allowed_mentions: Optional[AllowedMentions] = None,
+        delete_after: Optional[float] = None,
     ) -> InteractionMessage:
         """|coro|
 
@@ -822,6 +847,10 @@ async def edit(
         view: Optional[:class:`~discord.ui.View`]
             The updated view to update this message with. If ``None`` is passed then
             the view is removed.
+        delete_after: Optional[:class:`float`]
+            If provided, the number of seconds to wait in the background
+            before deleting the message we just edited. If the deletion fails,
+            then it is silently ignored.
 
         Raises
         -------
@@ -847,6 +876,7 @@ async def edit(
             files=files,
             view=view,
             allowed_mentions=allowed_mentions,
+            delete_after=delete_after
         )
 
     async def delete(self, *, delay: Optional[float] = None) -> None:
@@ -869,16 +899,4 @@ async def delete(self, *, delay: Optional[float] = None) -> None:
         HTTPException
             Deleting the message failed.
         """
-
-        if delay is not None:
-
-            async def inner_call(delay: float = delay):
-                await asyncio.sleep(delay)
-                try:
-                    await self._state._interaction.delete_original_message()
-                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)

discord/message.py

@@ -1137,18 +1137,11 @@ async def delete(self, *, delay: Optional[float] = None) -> None:
         HTTPException
             Deleting the message failed.
         """
+        del_func = self._state.http.delete_message(self.channel.id, self.id)
         if delay is not None:
-
-            async def delete(delay: float):
-                await asyncio.sleep(delay)
-                try:
-                    await self._state.http.delete_message(self.channel.id, self.id)
-                except HTTPException:
-                    pass
-
-            asyncio.create_task(delete(delay))
+            utils.delay_task(delay, del_func)
         else:
-            await self._state.http.delete_message(self.channel.id, self.id)
+            await del_func
 
     @overload
     async def edit(

discord/utils.py

@@ -44,6 +44,7 @@
     Any,
     AsyncIterator,
     Callable,
+    Coroutine,
     Dict,
     ForwardRef,
     Generic,
@@ -222,6 +223,17 @@ def count(self, value: Any) -> int:
         return self.__proxied.count(value)
 
 
+def delay_task(delay: float, func: Coroutine):
+    async def inner_call():
+        await asyncio.sleep(delay)
+        try:
+            await func
+        except HTTPException:
+            pass
+
+    asyncio.create_task(inner_call())
+
+
 @overload
 def parse_time(timestamp: None) -> None:
     ...