Generalize Implementation A Bit More

Author: Icebluewolf

discord/abc.py

@@ -1440,6 +1440,7 @@ async def send(
         poll=None,
         suppress=None,
         silent=None,
+        voice_message=None,
     ):
         """|coro|
 
@@ -1567,7 +1568,7 @@ async def send(
         flags = MessageFlags(
             suppress_embeds=bool(suppress),
             suppress_notifications=bool(silent),
-            is_voice_message=True,
+            is_voice_message=bool(voice_message),
         ).value
 
         if stickers is not None:

discord/file.py

@@ -63,6 +63,10 @@ class File:
         The description of a file, used by Discord to display alternative text on images.
     spoiler: :class:`bool`
         Whether the attachment is a spoiler.
+    waveform: Optional[:class:`str`]
+        The base64 encoded bytearray representing a sampled waveform. Currently only for voice messages
+    duration_secs: Optional[:class:`float`]
+        The duration of the audio file. Currently only for voice messages
     """
 
     __slots__ = (
@@ -90,9 +94,9 @@ def __init__(
         *,
         description: str | None = None,
         spoiler: bool = False,
+        waveform: str | None = None,
+        duration_secs: float | None = None,
     ):
-        self.waveform = "37WKcJ6jlLSVnaabsbeip4KPmHJXUUEbExgFJE8J7iNPFggpKQkTNl95dobFqqe2tKubnbSTX3yLVVBFS4iqd4dbKmFvMChwfVRKfWFYWRpLaV9jlYtKWWZde6mtnYiDlGNUgmFAWWdRXGNsf2NBYnNcS1uDjm+qwK2urKe8uKqjZ2KGSjtbLUpTO0iDYSBSg6CzCk1LNDVAZnOAvNiUkLu8r8vPnFw6bXZbbXcn0vUU8q2q38Olyfb0y7OhlnV9u6N4zuAH9uI="
-        self.duration_secs = 60.0
 
         if isinstance(fp, io.IOBase):
             if not (fp.seekable() and fp.readable()):
@@ -131,6 +135,8 @@ def __init__(
             self.filename is not None and self.filename.startswith("SPOILER_")
         )
         self.description = description
+        self.waveform = waveform
+        self.duration_secs = duration_secs
 
     def reset(self, *, seek: int | bool = True) -> None:
         # The `seek` parameter is needed because

discord/http.py

@@ -410,6 +410,7 @@ async def close(self) -> None:
     # login management
 
     async def static_login(self, token: str) -> user.User:
+        # TODO: Remove This When Testing Is Done
         import logging
 
         async def on_request_start(session, context, params: aiohttp.TraceRequestStartParams):
@@ -418,7 +419,10 @@ async def on_request_start(session, context, params: aiohttp.TraceRequestStartPa
 
         async def on_request_chunk_sent(session, context, params: aiohttp.TraceRequestChunkSentParams):
             with open("output.txt", "a") as file:
-                file.write(str(params.chunk))
+                if byte := str(params.chunk).find(r"\x", 100) != -1:
+                    file.write(str(params.chunk)[:byte] + "\n")
+                else:
+                    file.write(str(params.chunk) + "\n")
             # logging.getLogger('aiohttp.client').debug(f'Sent Chunk <{params}>')
 
         trace_config = aiohttp.TraceConfig()
@@ -587,8 +591,8 @@ def send_multipart_helper(
                     "id": index,
                     "filename": file.filename,
                     "description": file.description,
-                    "waveform": "37WKcJ6jlLSVnaabsbeip4KPmHJXUUEbExgFJE8J7iNPFggpKQkTNl95dobFqqe2tKubnbSTX3yLVVBFS4iqd4dbKmFvMChwfVRKfWFYWRpLaV9jlYtKWWZde6mtnYiDlGNUgmFAWWdRXGNsf2NBYnNcS1uDjm+qwK2urKe8uKqjZ2KGSjtbLUpTO0iDYSBSg6CzCk1LNDVAZnOAvNiUkLu8r8vPnFw6bXZbbXcn0vUU8q2q38Olyfb0y7OhlnV9u6N4zuAH9uI=",
-                    "duration_secs": 60.0,
+                    "waveform": file.waveform,
+                    "duration_secs": file.duration_secs,
                 }
             )
             form.append(
@@ -655,16 +659,16 @@ def edit_multipart_helper(
                     "id": index,
                     "filename": file.filename,
                     "description": file.description,
-                    "waveform": "37WKcJ6jlLSVnaabsbeip4KPmHJXUUEbExgFJE8J7iNPFggpKQkTNl95dobFqqe2tKubnbSTX3yLVVBFS4iqd4dbKmFvMChwfVRKfWFYWRpLaV9jlYtKWWZde6mtnYiDlGNUgmFAWWdRXGNsf2NBYnNcS1uDjm+qwK2urKe8uKqjZ2KGSjtbLUpTO0iDYSBSg6CzCk1LNDVAZnOAvNiUkLu8r8vPnFw6bXZbbXcn0vUU8q2q38Olyfb0y7OhlnV9u6N4zuAH9uI=",
-                    "duration_secs": 60.0
+                    "waveform": "AADz/+z/Pf+jBCD8pQE++8sDOv5H/WAH6PvR/uP8mfGCGnkCnAg58y77ewGH/U79AwXc9yUGlvloFmcF5fx9+kwFMQV8+GYDaf1oAToEmfm9APcB7gWs/mYEGgB5/VT9sfv3AAYCBALl/kX9jgDsA6UCLvtABNv/g/65/QP+xf2QAxsA8gKI/J3+1f5vBcAC5/ps/mQDigGn+FcEZAIZ/lYClP3a/rwEw/2g++wDpPoMB/36jAKPAC7+2wFo/IoBMgG2Aib9ivxqBFn7JwBn/LUEHP1R/T4EYv77AIoBd/wRBRX+DvwTA+4C0/l3AHQEiv98+n8B1wPj/DkA/gGp/zr7GQJv/HwAevlPBon8UP7bAyj/uAJp/SsCjPssAif/kP7bBIn9sQHq/9j94/+aADH+KQCcASj/1gHr/uYA/P1UAiz+XgEkANL9GgG8Adr+Mv/H/w8BgP+aASf+bAAgAE0AS/4hAWUASP/VAE3/5P5tAd39fQLq/zD/wADU/sgAo//T/zQBg/6nANf/8v/IAHH/iQCd/wQAEACa/3cA8v/s/x8A4v///xkA2v8QAA8A7P8LAPz/AAABAP3/AAAAAP//AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+                    "duration_secs": 10.032
                 }
             )
             form.append(
                 {
                     "name": f"files[{index}]",
                     "value": file.fp,
                     "filename": file.filename,
-                    "content_type": "application/octet-stream",
+                    "content_type": "audio/wav",
                 }
             )
         if "attachments" not in payload:
@@ -1291,8 +1295,6 @@ def start_forum_thread(
                         "id": index,
                         "filename": file.filename,
                         "description": file.description,
-                        "waveform": "37WKcJ6jlLSVnaabsbeip4KPmHJXUUEbExgFJE8J7iNPFggpKQkTNl95dobFqqe2tKubnbSTX3yLVVBFS4iqd4dbKmFvMChwfVRKfWFYWRpLaV9jlYtKWWZde6mtnYiDlGNUgmFAWWdRXGNsf2NBYnNcS1uDjm+qwK2urKe8uKqjZ2KGSjtbLUpTO0iDYSBSg6CzCk1LNDVAZnOAvNiUkLu8r8vPnFw6bXZbbXcn0vUU8q2q38Olyfb0y7OhlnV9u6N4zuAH9uI=",
-                        "duration_secs": 60.0
                     }
                 )
                 form.append(

discord/interactions.py

@@ -840,6 +840,7 @@ async def send_message(
         files: list[File] = None,
         poll: Poll = None,
         delete_after: float = None,
+        voice_message: bool = False,
     ) -> Interaction:
         """|coro|
 
@@ -877,6 +878,10 @@ async def send_message(
             The poll to send.
 
             .. versionadded:: 2.6
+        voice_message: :class:`bool`
+            If the file should be treated as a voice message.
+
+            .. versionadded:: 2.7
 
         Returns
         -------
@@ -917,8 +922,9 @@ async def send_message(
 
         if ephemeral:
             payload["flags"] = 64
+        if voice_message:
+            payload["flags"] = payload.setdefault("flags", 0) + 8192
 
-        payload["flags"] = 8192
 
         if view is not None:
             payload["components"] = view.to_components()

discord/webhook/async_.py

@@ -156,7 +156,6 @@ async def request(
                     for p in multipart:
                         form_data.add_field(**p)
                     to_send = form_data
-                    print(to_send)
                 try:
                     async with session.request(
                         method,
@@ -513,18 +512,23 @@ def create_interaction_response(
                     "id": index,
                     "filename": file.filename,
                     "description": file.description,
-                    "waveform": "37WKcJ6jlLSVnaabsbeip4KPmHJXUUEbExgFJE8J7iNPFggpKQkTNl95dobFqqe2tKubnbSTX3yLVVBFS4iqd4dbKmFvMChwfVRKfWFYWRpLaV9jlYtKWWZde6mtnYiDlGNUgmFAWWdRXGNsf2NBYnNcS1uDjm+qwK2urKe8uKqjZ2KGSjtbLUpTO0iDYSBSg6CzCk1LNDVAZnOAvNiUkLu8r8vPnFw6bXZbbXcn0vUU8q2q38Olyfb0y7OhlnV9u6N4zuAH9uI=",
-                    "duration_secs": 60.0,
+                    "duration_secs": file.duration_secs,
+                    "waveform": file.waveform,
+                    # TODO: Fix content_type
+                    #"content_type": "audio/mp3",
                 }
             )
             form.append(
                 {
                     "name": f"files[{index}]",
                     "value": file.fp,
                     "filename": file.filename,
-                    "content_type": "application/octet-stream",
+                    # TODO: Fix content_type
+                    #"content_type": "application/octet-stream",
+                    #"content_type": "audio/mp3",
                 }
             )
+        payload["flags"] = 1 << 13
         payload["attachments"] = attachments
         form[0]["value"] = utils._to_json(payload)
 
@@ -631,6 +635,7 @@ def handle_message_parameters(
     allowed_mentions: AllowedMentions | None = MISSING,
     previous_allowed_mentions: AllowedMentions | None = None,
     suppress: bool = False,
+    voice_message: bool = False,
 ) -> ExecuteWebhookParameters:
     if files is not MISSING and file is not MISSING:
         raise TypeError("Cannot mix file and files keyword arguments.")
@@ -661,7 +666,7 @@ def handle_message_parameters(
     if username:
         payload["username"] = username
 
-    flags = MessageFlags(suppress_embeds=suppress, ephemeral=ephemeral)
+    flags = MessageFlags(suppress_embeds=suppress, ephemeral=ephemeral, is_voice_message=voice_message)
     payload["flags"] = flags.value
 
     if applied_tags is not MISSING:
@@ -690,15 +695,17 @@ def handle_message_parameters(
                     "value": file.fp,
                     "filename": file.filename,
                     "content_type": "application/octet-stream",
-                    "waveform": "37WKcJ6jlLSVnaabsbeip4KPmHJXUUEbExgFJE8J7iNPFggpKQkTNl95dobFqqe2tKubnbSTX3yLVVBFS4iqd4dbKmFvMChwfVRKfWFYWRpLaV9jlYtKWWZde6mtnYiDlGNUgmFAWWdRXGNsf2NBYnNcS1uDjm+qwK2urKe8uKqjZ2KGSjtbLUpTO0iDYSBSg6CzCk1LNDVAZnOAvNiUkLu8r8vPnFw6bXZbbXcn0vUU8q2q38Olyfb0y7OhlnV9u6N4zuAH9uI=",
-                    "duration_secs": 60.0,
                 }
             )
             _attachments.append(
                 {
                     "id": index,
                     "filename": file.filename,
                     "description": file.description,
+                    "waveform": file.waveform,
+                    "duration_secs": file.duration_secs,
+                    # TODO: Fix content_type
+                    "content_type": "audio/wav",
                 }
             )
 
@@ -1586,6 +1593,7 @@ async def send(
         thread: Snowflake = MISSING,
         thread_name: str | None = None,
         applied_tags: list[Snowflake] = MISSING,
+        voice_message: bool = MISSING,
         wait: Literal[True],
         delete_after: float = None,
     ) -> WebhookMessage: ...
@@ -1609,6 +1617,7 @@ async def send(
         thread: Snowflake = MISSING,
         thread_name: str | None = None,
         applied_tags: list[Snowflake] = MISSING,
+        voice_message: bool = MISSING,
         wait: Literal[False] = ...,
         delete_after: float = None,
     ) -> None: ...
@@ -1631,6 +1640,7 @@ async def send(
         thread: Snowflake = MISSING,
         thread_name: str | None = None,
         applied_tags: list[Snowflake] = MISSING,
+        voice_message: bool = MISSING,
         wait: bool = False,
         delete_after: float = None,
     ) -> WebhookMessage | None:
@@ -1713,6 +1723,10 @@ async def send(
             The poll to send.
 
             .. versionadded:: 2.6
+        voice_message: :class:`bool`
+            If the file should be treated as a voice message.
+
+            .. versionadded:: 2.7
 
         Returns
         -------
@@ -1790,6 +1804,7 @@ async def send(
             applied_tags=applied_tags,
             allowed_mentions=allowed_mentions,
             previous_allowed_mentions=previous_mentions,
+            voice_message=voice_message
         )
         adapter = async_context.get()
         thread_id: int | None = None