Merge branch 'Pycord-Development:master' into disable-view

Pycord-Development · Apr 12, 2022 · be46a6e · be46a6e
2 parents 981a326 + a3e1dd0
commit be46a6e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/discord/ext/pages/pagination.py b/discord/ext/pages/pagination.py
@@ -756,7 +756,8 @@ async def send(
         target_message: Optional[str] = None,
         reference: Optional[Union[discord.Message, discord.MessageReference, discord.PartialMessage]] = None,
         allowed_mentions: Optional[discord.AllowedMentions] = None,
-        mention_author: bool = None,
+        mention_author: Optional[bool] = None,
+        delete_after: Optional[float] = None,
     ) -> discord.Message:
         """Sends a message with the paginated items.
 
@@ -782,6 +783,8 @@ async def send(
             are used instead.
         mention_author: Optional[:class:`bool`]
             If set, overrides the :attr:`~discord.AllowedMentions.replied_user` attribute of ``allowed_mentions``.
+        delete_after: Optional[:class:`float`]
+            If set, deletes the paginator after the specified time.
 
         Returns
         --------
@@ -831,6 +834,7 @@ async def send(
             reference=reference,
             allowed_mentions=allowed_mentions,
             mention_author=mention_author,
+            delete_after=delete_after,
         )
 
         return self.message

diff --git a/discord/threads.py b/discord/threads.py
@@ -351,7 +351,7 @@ def permissions_for(self, obj: Union[Member, Role], /) -> Permissions:
             raise ClientException("Parent channel not found")
         return parent.permissions_for(obj)
 
-    async def delete_messages(self, messages: Iterable[Snowflake]) -> None:
+    async def delete_messages(self, messages: Iterable[Snowflake], *, reason: Optional[str] = None) -> None:
         """|coro|
 
         Deletes a list of messages. This is similar to :meth:`Message.delete`
@@ -373,6 +373,8 @@ async def delete_messages(self, messages: Iterable[Snowflake]) -> None:
         -----------
         messages: Iterable[:class:`abc.Snowflake`]
             An iterable of messages denoting which ones to bulk delete.
+        reason: Optional[:class:`str`]
+            The reason for deleting the messages. Shows up on the audit log.
 
         Raises
         ------
@@ -394,14 +396,14 @@ async def delete_messages(self, messages: Iterable[Snowflake]) -> None:
 
         if len(messages) == 1:
             message_id = messages[0].id
-            await self._state.http.delete_message(self.id, message_id)
+            await self._state.http.delete_message(self.id, message_id, reason=reason)
             return
 
         if len(messages) > 100:
             raise ClientException("Can only bulk delete messages up to 100 messages")
 
         message_ids: SnowflakeList = [m.id for m in messages]
-        await self._state.http.delete_messages(self.id, message_ids)
+        await self._state.http.delete_messages(self.id, message_ids, reason=reason)
 
     async def purge(
             self,