fix: remove internal use of deprecated suppress (#3154)

* fix: remove internal use of deprecated suppress

* Update discord/ext/pages/pagination.py

Co-authored-by: Paillat <jeremiecotti@ik.me>
Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com>

* changelog entry for #3154

* style(pre-commit): auto fixes from pre-commit.com hooks

* revert changelog

---------

Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com>
Co-authored-by: Paillat <jeremiecotti@ik.me>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

discord/ext/pages/pagination.py

@@ -43,6 +43,8 @@
     "Page",
 )
 
+from ...utils import warn_deprecated
+
 
 class PaginatorButton(discord.ui.Button):
     """Creates a button used to navigate the paginator.
@@ -1065,6 +1067,7 @@ async def edit(
         self,
         message: discord.Message,
         suppress: bool | None = None,
+        suppress_embeds: bool = None,
         allowed_mentions: discord.AllowedMentions | None = None,
         delete_after: float | None = None,
         user: User | Member | None = None,
@@ -1084,6 +1087,15 @@ async def edit(
             all the embeds if set to ``True``. If set to ``False``
             this brings the embeds back if they were suppressed.
             Using this parameter requires :attr:`~.Permissions.manage_messages`.
+
+            .. deprecated:: 2.8
+        suppress_embeds: :class:`bool`
+            Whether to suppress embeds for the message. This removes
+            all the embeds if set to ``True``. If set to ``False``
+            this brings the embeds back if they were suppressed.
+            Using this parameter requires :attr:`~.Permissions.manage_messages`.
+
+            .. versionadded:: 2.8
         allowed_mentions: Optional[:class:`~discord.AllowedMentions`]
             Controls the mentions being processed in this message. If this is
             passed, then the object is merged with :attr:`~discord.Client.allowed_mentions`.
@@ -1119,14 +1131,19 @@ async def edit(
         if not self.user:
             self.usercheck = False
 
+        if suppress is not None:
+            warn_deprecated("suppress", "suppress_embeds", "2.8")
+            if suppress_embeds is None:
+                suppress_embeds = suppress
+
         try:
             self.message = await message.edit(
                 content=page_content.content,
                 embeds=page_content.embeds,
                 files=page_content.files,
                 attachments=[],
                 view=self,
-                suppress=suppress,
+                suppress_embeds=suppress_embeds,
                 allowed_mentions=allowed_mentions,
                 delete_after=delete_after,
             )

discord/interactions.py

@@ -619,7 +619,7 @@ async def edit_original_response(
             view=view,
             allowed_mentions=allowed_mentions,
             previous_allowed_mentions=previous_mentions,
-            suppress=suppress_embeds,
+            suppress_embeds=suppress_embeds,
         )
         if view and self.message:
             self._state.prevent_view_updates_for(self.message.id)
@@ -1622,6 +1622,7 @@ async def edit(
         allowed_mentions: AllowedMentions | None = None,
         delete_after: float | None = None,
         suppress: bool | None = MISSING,
+        suppress_embeds: bool | None = MISSING,
     ) -> InteractionMessage:
         """|coro|
 
@@ -1657,6 +1658,12 @@ async def edit(
         suppress: Optional[:class:`bool`]
             Whether to suppress embeds for the message.
 
+            .. deprecated:: 2.8
+        suppress_embeds: Optional[:class:`bool`]
+            Whether to suppress embeds for the message.
+
+            .. versionadded:: 2.8
+
         Returns
         -------
         :class:`InteractionMessage`
@@ -1675,8 +1682,15 @@ async def edit(
         """
         if attachments is MISSING:
             attachments = self.attachments or MISSING
-        if suppress is MISSING:
-            suppress = self.flags.suppress_embeds
+
+        if suppress is not MISSING:
+            warn_deprecated("suppress", "suppress_embeds", "2.8")
+            if suppress_embeds is MISSING:
+                suppress_embeds = suppress
+
+        if suppress_embeds is MISSING:
+            suppress_embeds = self.flags.suppress_embeds
+
         return await self._state._interaction.edit_original_response(
             content=content,
             embeds=embeds,
@@ -1687,7 +1701,7 @@ async def edit(
             view=view,
             allowed_mentions=allowed_mentions,
             delete_after=delete_after,
-            suppress=suppress,
+            suppress_embeds=suppress_embeds,
         )
 
     async def delete(self, *, delay: float | None = None) -> None:

discord/webhook/async_.py

@@ -901,6 +901,7 @@ async def edit(
         view: BaseView | None = MISSING,
         allowed_mentions: AllowedMentions | None = None,
         suppress: bool | None = MISSING,
+        suppress_embeds: bool | None = MISSING,
     ) -> WebhookMessage:
         """|coro|
 
@@ -945,6 +946,12 @@ async def edit(
         suppress: Optional[:class:`bool`]
             Whether to suppress embeds for the message.
 
+            .. deprecated:: 2.8
+        suppress_embeds: Optional[:class:`bool`]
+            Whether to suppress embeds for the message.
+
+            .. versionadded:: 2.8
+
         Returns
         -------
         :class:`WebhookMessage`
@@ -974,8 +981,13 @@ async def edit(
         if attachments is MISSING:
             attachments = self.attachments or MISSING
 
-        if suppress is MISSING:
-            suppress = self.flags.suppress_embeds
+        if suppress is not MISSING:
+            warn_deprecated("suppress", "suppress_embeds", "2.8")
+            if suppress_embeds is MISSING:
+                suppress_embeds = suppress
+
+        if suppress_embeds is MISSING:
+            suppress_embeds = self.flags.suppress_embeds
 
         return await self._state._webhook.edit_message(
             self.id,
@@ -988,7 +1000,7 @@ async def edit(
             view=view,
             allowed_mentions=allowed_mentions,
             thread=thread,
-            suppress=suppress,
+            suppress_embeds=suppress_embeds,
         )
 
     async def delete(self, *, delay: float | None = None) -> None:
@@ -1897,7 +1909,7 @@ async def send(
             previous_allowed_mentions=previous_mentions,
             thread_name=thread_name,
             silent=silent,
-            suppress=suppress_embeds,
+            suppress_embeds=suppress_embeds,
         )
         adapter = async_context.get()
         thread_id: int | None = None
@@ -2009,7 +2021,8 @@ async def edit_message(
         view: BaseView | None = MISSING,
         allowed_mentions: AllowedMentions | None = None,
         thread: Snowflake | None = MISSING,
-        suppress: bool = False,
+        suppress: bool | None = None,
+        suppress_embeds: bool = None,
     ) -> WebhookMessage:
         """|coro|
 
@@ -2060,6 +2073,12 @@ async def edit_message(
         suppress: :class:`bool`
             Whether to suppress embeds for the message.
 
+            .. deprecated:: 2.8
+        suppress_embeds: :class:`bool`
+            Whether to suppress embeds for the message.
+
+            .. versionadded:: 2.8
+
         Returns
         -------
         :class:`WebhookMessage`
@@ -2104,6 +2123,12 @@ async def edit_message(
         previous_mentions: AllowedMentions | None = getattr(
             self._state, "allowed_mentions", None
         )
+        if suppress is not None:
+            warn_deprecated("suppress", "suppress_embeds", "2.8")
+            if suppress_embeds is None:
+                suppress_embeds = suppress
+        elif suppress_embeds is None:
+            suppress_embeds = False
         params = handle_message_parameters(
             content=content,
             file=file,
@@ -2114,7 +2139,7 @@ async def edit_message(
             view=view,
             allowed_mentions=allowed_mentions,
             previous_allowed_mentions=previous_mentions,
-            suppress=suppress,
+            suppress_embeds=suppress_embeds,
         )
 
         thread_id: int | None = None

discord/webhook/sync.py

@@ -542,7 +542,7 @@ def edit(
             files=files,
             allowed_mentions=allowed_mentions,
             thread=thread,
-            suppress=suppress_embeds,
+            suppress_embeds=suppress_embeds,
         )
 
     def delete(self, *, delay: float | None = None) -> None:
@@ -986,7 +986,8 @@ def send(
         thread: Snowflake = MISSING,
         thread_name: str | None = None,
         wait: bool = False,
-        suppress: bool = False,
+        suppress: bool | None = None,
+        suppress_embeds: bool = None,
     ) -> SyncWebhookMessage | None:
         """Sends a message using the webhook.
 
@@ -1042,6 +1043,12 @@ def send(
         suppress: :class:`bool`
             Whether to suppress embeds for the message.
 
+            .. deprecated:: 2.8
+        suppress_embeds: :class:`bool`
+            Whether to suppress embeds for the message.
+
+            .. versionadded:: 2.8
+
         Returns
         -------
         Optional[:class:`SyncWebhookMessage`]
@@ -1078,6 +1085,13 @@ def send(
         if thread and thread_name:
             raise InvalidArgument("You cannot specify both a thread and a thread name")
 
+        if suppress is not None:
+            warn_deprecated("suppress", "suppress_embeds", "2.8")
+            if suppress_embeds is None:
+                suppress_embeds = suppress
+        elif suppress_embeds is None:
+            suppress_embeds = False
+
         params = handle_message_parameters(
             content=content,
             username=username,
@@ -1089,7 +1103,7 @@ def send(
             embeds=embeds,
             allowed_mentions=allowed_mentions,
             previous_allowed_mentions=previous_mentions,
-            suppress=suppress,
+            suppress_embeds=suppress_embeds,
             thread_name=thread_name,
         )
         adapter: WebhookAdapter = _get_webhook_adapter()
@@ -1171,7 +1185,8 @@ def edit_message(
         files: list[File] = MISSING,
         allowed_mentions: AllowedMentions | None = None,
         thread: Snowflake | None = MISSING,
-        suppress: bool = False,
+        suppress: bool | None = None,
+        suppress_embeds: bool = None,
     ) -> SyncWebhookMessage:
         """Edits a message owned by this webhook.
 
@@ -1201,6 +1216,14 @@ def edit_message(
             See :meth:`.abc.Messageable.send` for more information.
         thread: Optional[:class:`~discord.abc.Snowflake`]
             The thread that contains the message.
+        suppress: :class:`bool`
+            Whether to suppress embeds for the message.
+
+            .. deprecated:: 2.8
+        suppress_embeds: :class:`bool`
+            Whether to suppress embeds for the message.
+
+            .. versionadded:: 2.8
 
         Raises
         ------
@@ -1224,6 +1247,12 @@ def edit_message(
         previous_mentions: AllowedMentions | None = getattr(
             self._state, "allowed_mentions", None
         )
+        if suppress is not None:
+            warn_deprecated("suppress", "suppress_embeds", "2.8")
+            if suppress_embeds is None:
+                suppress_embeds = suppress
+        elif suppress_embeds is None:
+            suppress_embeds = False
         params = handle_message_parameters(
             content=content,
             file=file,
@@ -1232,7 +1261,7 @@ def edit_message(
             embeds=embeds,
             allowed_mentions=allowed_mentions,
             previous_allowed_mentions=previous_mentions,
-            suppress=suppress,
+            suppress_embeds=suppress_embeds,
         )
         adapter: WebhookAdapter = _get_webhook_adapter()