From 11a9d49fcb6179f0086b6421db64e89758d86edb Mon Sep 17 00:00:00 2001 From: Moksej <58531286+TheMoksej@users.noreply.github.com> Date: Sat, 28 Aug 2021 21:45:23 +0200 Subject: [PATCH 1/6] add back the silent kwarg to message.delete --- discord/message.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/discord/message.py b/discord/message.py index 304c807d..053bc4d6 100644 --- a/discord/message.py +++ b/discord/message.py @@ -1106,7 +1106,7 @@ class Message(Hashable): if self.type is MessageType.guild_invite_reminder: return 'Wondering who to invite?\nStart by inviting anyone who can help you build the server!' - async def delete(self, *, delay: Optional[float] = None) -> None: + async def delete(self, *, delay: Optional[float] = None, silent: Optional[bool] = False) -> None: """|coro| Deletes the message. @@ -1123,6 +1123,9 @@ class Message(Hashable): delay: Optional[:class:`float`] If provided, the number of seconds to wait in the background before deleting the message. If the deletion fails then it is silently ignored. + silent: Optional[:class:`bool`] + If silent is set to ``True``, the error will not be raised, it will be ignored. + This defaults to ``False`` Raises ------ @@ -1144,7 +1147,13 @@ class Message(Hashable): asyncio.create_task(delete(delay)) else: - await self._state.http.delete_message(self.channel.id, self.id) + try: + await self._state.http.delete_message(self.channel.id, self.id) + except Exception as e: + if silent: + pass + else: + raise e @overload async def edit( -- 2.47.2 From 9738757488079e0469af483899694b64a8df7814 Mon Sep 17 00:00:00 2001 From: Moksej <58531286+TheMoksej@users.noreply.github.com> Date: Sat, 28 Aug 2021 21:56:43 +0200 Subject: [PATCH 2/6] forgot about versionadded --- discord/message.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/discord/message.py b/discord/message.py index 053bc4d6..de82950a 100644 --- a/discord/message.py +++ b/discord/message.py @@ -1117,6 +1117,8 @@ class Message(Hashable): .. versionchanged:: 1.1 Added the new ``delay`` keyword-only parameter. + .. versionadded:: 2.0 + Added the new ``silent`` keyword-only parameter. Parameters ----------- -- 2.47.2 From 2bc75d51eadbd10fa357fa064d88a14f67393afe Mon Sep 17 00:00:00 2001 From: Moksej <58531286+TheMoksej@users.noreply.github.com> Date: Sat, 28 Aug 2021 22:06:31 +0200 Subject: [PATCH 3/6] shorten the if statement --- discord/message.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/discord/message.py b/discord/message.py index de82950a..d7c4bba9 100644 --- a/discord/message.py +++ b/discord/message.py @@ -1152,9 +1152,7 @@ class Message(Hashable): try: await self._state.http.delete_message(self.channel.id, self.id) except Exception as e: - if silent: - pass - else: + if not silent: raise e @overload -- 2.47.2 From c6b37cce26cbf1ed7291a63a65d29142c0fa357e Mon Sep 17 00:00:00 2001 From: Moksej <58531286+TheMoksej@users.noreply.github.com> Date: Sun, 29 Aug 2021 00:04:37 +0200 Subject: [PATCH 4/6] simplify raising a bit ig? --- discord/message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discord/message.py b/discord/message.py index d7c4bba9..ff50d21f 100644 --- a/discord/message.py +++ b/discord/message.py @@ -1151,9 +1151,9 @@ class Message(Hashable): else: try: await self._state.http.delete_message(self.channel.id, self.id) - except Exception as e: + except Exception: if not silent: - raise e + raise @overload async def edit( -- 2.47.2 From 8d768149fd400796c94d096961ed9f3eff4c65c1 Mon Sep 17 00:00:00 2001 From: Moksej <58531286+TheMoksej@users.noreply.github.com> Date: Sun, 29 Aug 2021 00:14:34 +0200 Subject: [PATCH 5/6] should be versionchanged instead Co-authored-by: Arthur --- discord/message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discord/message.py b/discord/message.py index ff50d21f..1f220293 100644 --- a/discord/message.py +++ b/discord/message.py @@ -1117,7 +1117,7 @@ class Message(Hashable): .. versionchanged:: 1.1 Added the new ``delay`` keyword-only parameter. - .. versionadded:: 2.0 + .. versionchanged:: 2.0 Added the new ``silent`` keyword-only parameter. Parameters -- 2.47.2 From 2ec6182c055467673ac411395bd5f823d114ea20 Mon Sep 17 00:00:00 2001 From: Moksej <58531286+TheMoksej@users.noreply.github.com> Date: Sun, 29 Aug 2021 00:32:59 +0200 Subject: [PATCH 6/6] remove `Optional` from parameter and doc string --- discord/message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discord/message.py b/discord/message.py index 1f220293..4672b1cf 100644 --- a/discord/message.py +++ b/discord/message.py @@ -1106,7 +1106,7 @@ class Message(Hashable): if self.type is MessageType.guild_invite_reminder: return 'Wondering who to invite?\nStart by inviting anyone who can help you build the server!' - async def delete(self, *, delay: Optional[float] = None, silent: Optional[bool] = False) -> None: + async def delete(self, *, delay: Optional[float] = None, silent: bool = False) -> None: """|coro| Deletes the message. @@ -1125,7 +1125,7 @@ class Message(Hashable): delay: Optional[:class:`float`] If provided, the number of seconds to wait in the background before deleting the message. If the deletion fails then it is silently ignored. - silent: Optional[:class:`bool`] + silent: :class:`bool` If silent is set to ``True``, the error will not be raised, it will be ignored. This defaults to ``False`` -- 2.47.2