add support for sending file(s) in interaction response (#263)

* add support for sending file(s) in interaction response

* update docstring

* fix

* add ephemeral attribute to Attachment

Author: zeffo

discord/interactions.py

@@ -31,9 +31,9 @@
 
 from . import utils
 from .enums import try_enum, InteractionType, InteractionResponseType
-from .errors import InteractionResponded, HTTPException, ClientException
+from .errors import InteractionResponded, HTTPException, ClientException, InvalidArgument
 from .channel import PartialMessageable, ChannelType
-
+from .file import File
 from .user import User
 from .member import Member
 from .message import Message, Attachment
@@ -55,7 +55,6 @@
     )
     from .guild import Guild
     from .state import ConnectionState
-    from .file import File
     from .mentions import AllowedMentions
     from aiohttp import ClientSession
     from .embeds import Embed
@@ -463,6 +462,8 @@ async def send_message(
         tts: bool = False,
         ephemeral: bool = False,
         allowed_mentions: AllowedMentions = None,
+        file: File = None,
+        files: List[File] = None,
         delete_after: float = None
     ) -> None:
         """|coro|
@@ -493,6 +494,10 @@ async def send_message(
         delete_after: :class:`float`
             If provided, the number of seconds to wait in the background
             before deleting the message we just sent.
+        file: :class:`File`
+            The file to upload.
+        files: :class:`List[File]`
+            A list of files to upload. Must be a maximum of 10.
             
         Raises
         -------
@@ -535,15 +540,36 @@ async def send_message(
         if allowed_mentions:
             payload['allowed_mentions'] = allowed_mentions.to_dict()
 
+        if file is not None and files is not None:
+            raise InvalidArgument('cannot pass both file and files parameter to send()')
+        
+        if file is not None:
+            if not isinstance(file, File):
+                raise InvalidArgument('file parameter must be File')
+            else:
+                files = [file]
+
+        if files is not None:
+            if len(files) > 10:
+                raise InvalidArgument('files parameter must be a list of up to 10 elements')
+            elif not all(isinstance(file, File) for file in files):
+                raise InvalidArgument('files parameter must be a list of File')
+
         parent = self._parent
         adapter = async_context.get()
-        await adapter.create_interaction_response(
-            parent.id,
-            parent.token,
-            session=parent._session,
-            type=InteractionResponseType.channel_message.value,
-            data=payload,
-        )
+        try:
+            await adapter.create_interaction_response(
+                parent.id,
+                parent.token,
+                session=parent._session,
+                type=InteractionResponseType.channel_message.value,
+                data=payload,
+                files=files
+            )
+        finally:
+            if files:
+                for file in files:
+                    file.close()
 
         if view is not MISSING:
             if ephemeral and view.timeout is None:
@@ -784,4 +810,4 @@ async def inner_call(delay: float = delay):
 
             asyncio.create_task(inner_call())
         else:
-            await self._state._interaction.delete_original_message()
+            await self._state._interaction.delete_original_message()

discord/message.py

@@ -150,11 +150,13 @@ class Attachment(Hashable):
         minutes or not valid at all.
     content_type: Optional[:class:`str`]
         The attachment's `media type <https://en.wikipedia.org/wiki/Media_type>`_
+    ephemeral: :class:`bool`
+        Whether the attachment is ephemeral or not.
 
         .. versionadded:: 1.7
     """
 
-    __slots__ = ('id', 'size', 'height', 'width', 'filename', 'url', 'proxy_url', '_http', 'content_type')
+    __slots__ = ('id', 'size', 'height', 'width', 'filename', 'url', 'proxy_url', '_http', 'content_type', 'ephemeral')
 
     def __init__(self, *, data: AttachmentPayload, state: ConnectionState):
         self.id: int = int(data['id'])
@@ -166,6 +168,7 @@ def __init__(self, *, data: AttachmentPayload, state: ConnectionState):
         self.proxy_url: str = data.get('proxy_url')
         self._http = state.http
         self.content_type: Optional[str] = data.get('content_type')
+        self.ephemeral: bool = data['ephemeral']
 
     def is_spoiler(self) -> bool:
         """:class:`bool`: Whether this attachment contains a spoiler."""

discord/webhook/async_.py

@@ -146,7 +146,6 @@ async def request(
                     for p in multipart:
                         form_data.add_field(**p)
                     to_send = form_data
-
                 try:
                     async with session.request(method, url, data=to_send, headers=headers, params=params) as response:
                         _log.debug(
@@ -350,13 +349,37 @@ def create_interaction_response(
         session: aiohttp.ClientSession,
         type: int,
         data: Optional[Dict[str, Any]] = None,
+        files: List[File]=None
+
     ) -> Response[None]:
         payload: Dict[str, Any] = {
             'type': type,
         }
 
         if data is not None:
             payload['data'] = data
+        form = [{'name': 'payload_json', 'value': utils._to_json(payload)}]
+        files = files or []
+        if len(files) == 1:
+            file = files[0]
+            form.append(
+                {
+                    'name': 'file',
+                    'value': file.fp,
+                    'filename': file.filename,
+                    'content_type': 'application/octet-stream',
+                }
+            )
+        else:
+            for index, file in enumerate(files):
+                form.append(
+                    {
+                        'name': f'file{index}',
+                        'value': file.fp,
+                        'filename': file.filename,
+                        'content_type': 'application/octet-stream',
+                    }
+                )
 
         route = Route(
             'POST',
@@ -365,7 +388,7 @@ def create_interaction_response(
             webhook_token=token,
         )
 
-        return self.request(route, session=session, payload=payload)
+        return self.request(route, session=session, files=files, multipart=form)
 
     def get_original_interaction_response(
         self,