From 8f1d548f91fe6b27cec73ac66d2451a9d3d98df6 Mon Sep 17 00:00:00 2001 From: blord0 Date: Mon, 28 Jul 2025 01:26:50 +0100 Subject: [PATCH] Change checking for voice messages to use File.voice --- discord/abc.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/discord/abc.py b/discord/abc.py index 2e0f971b7..4fa98b59e 100644 --- a/discord/abc.py +++ b/discord/abc.py @@ -1404,7 +1404,6 @@ class Messageable: suppress_embeds: bool = ..., silent: bool = ..., poll: Poll = ..., - voice: bool = ..., ) -> Message: ... @@ -1426,7 +1425,6 @@ class Messageable: suppress_embeds: bool = ..., silent: bool = ..., poll: Poll = ..., - voice: bool = ..., ) -> Message: ... @@ -1448,7 +1446,6 @@ class Messageable: suppress_embeds: bool = ..., silent: bool = ..., poll: Poll = ..., - voice: bool = ..., ) -> Message: ... @@ -1470,7 +1467,6 @@ class Messageable: suppress_embeds: bool = ..., silent: bool = ..., poll: Poll = ..., - voice: bool = ..., ) -> Message: ... @@ -1493,7 +1489,6 @@ class Messageable: suppress_embeds: bool = False, silent: bool = False, poll: Optional[Poll] = None, - voice: bool = False, ) -> Message: """|coro| @@ -1584,10 +1579,6 @@ class Messageable: The poll to send with this message. .. versionadded:: 2.4 - voice: :class:`bool` - If the message is a voice message. - - .. versionadded:: 2.6 Raises -------- @@ -1633,6 +1624,14 @@ class Messageable: if view and not hasattr(view, '__discord_ui_view__'): raise TypeError(f'view parameter must be View not {view.__class__.__name__}') + voice = False + if file is not None and file.voice: + if content is not None: + raise TypeError('Cannot send content with a voice message') + if embed is not None or embeds is not None: + raise TypeError('Cannot send embeds with a voice message') + voice = True + if suppress_embeds or silent or voice: from .message import MessageFlags # circular import @@ -1643,16 +1642,6 @@ class Messageable: else: flags = MISSING - if voice: - if content is not None: - raise TypeError('Cannot send content with a voice message') - if embed is not None or embeds is not None: - raise TypeError('Cannot send embeds with a voice message') - if file is None: - raise TypeError('A voice message must have a file') - if file.duation is None: - raise TypeError('A voice message file must have a duration') - if nonce is None: nonce = secrets.randbits(64)