Merge pull request #139 from eunwoo1104/anothercat/files-in-edit

Implement files in editing messages

Author: eunwoo1104

discord_slash/context.py

@@ -140,7 +140,7 @@ async def send(self,
         .. warning::
             - Since Release 1.0.9, this is completely changed. If you are migrating from older version, please make sure to fix the usage.
             - You can't use both ``embed`` and ``embeds`` at the same time, also applies to ``file`` and ``files``.
-            - You cannot send files in the initial response
+            - If you send files in the initial response, this will defer if it's not been deferred, and then PATCH with the message
 
         :param content:  Content of the response.
         :type content: str
@@ -193,15 +193,15 @@ async def send(self,
         initial_message = False
         if not self.responded:
             initial_message = True
-            if files:
-                raise error.IncorrectFormat("You cannot send files in the initial response!")
+            if files and not self.deferred:
+                await self.defer(hidden=hidden)
             if self.deferred:
                 if self._deferred_hidden != hidden:
                     self._logger.warning(
                         "deferred response might not be what you set it to! (hidden / visible) "
                         "This is because it was deferred in a different state"
                     )
-                resp = await self._http.edit(base, self.__token)
+                resp = await self._http.edit(base, self.__token, files = files)
                 self.deferred = False
             else:
                 json_data = {
@@ -216,6 +216,9 @@ async def send(self,
             self.responded = True
         else:
             resp = await self._http.post_followup(base, self.__token, files=files)
+        if files:
+            for file in files:
+                file.close()
         if not hidden:
             smsg = model.SlashMessage(state=self.bot._connection,
                                       data=resp,
@@ -228,4 +231,4 @@ async def send(self,
                 self.message = smsg
             return smsg
         else:
-            return resp
+            return resp

discord_slash/http.py

@@ -96,7 +96,7 @@ def post_followup(self, _resp, token, files: typing.List[discord.File] = None):
         :return: Coroutine
         """
         if files:
-            return self.post_with_files(_resp, files, token)
+            return self.request_with_files(_resp, files, token, "POST")
         return self.command_response(token, True, "POST", json=_resp)
 
     def post_initial_response(self, _resp, interaction_id, token):
@@ -130,27 +130,31 @@ def command_response(self, token, use_webhook, method, interaction_id= None, url
         route = CustomRoute(method, req_url)
         return self._discord.http.request(route, **kwargs)
 
-    def post_with_files(self, _resp, files: typing.List[discord.File], token):
+    def request_with_files(self, _resp, files: typing.List[discord.File], token, method, url_ending = ""):
 
         form = aiohttp.FormData()
         form.add_field("payload_json", json.dumps(_resp))
         for x in range(len(files)):
             name = f"file{x if len(files) > 1 else ''}"
             sel = files[x]
             form.add_field(name, sel.fp, filename=sel.filename, content_type="application/octet-stream")
-        return self.command_response(token, True, "POST", data=form, files=files)
+        return self.command_response(token, True, method, data=form, files=files, url_ending=url_ending)
 
-    def edit(self, _resp, token, message_id="@original"):
+    def edit(self, _resp, token, message_id="@original", files: typing.List[discord.File] = None):
         """
         Sends edit command response PATCH request to Discord API.
 
         :param _resp: Edited response.
         :type _resp: dict
         :param token: Command message token.
         :param message_id: Message ID to edit. Default initial message.
+        :param files: Files. Default ``None``
+        :type files: List[discord.File]
         :return: Coroutine
         """
         req_url = f"/messages/{message_id}"
+        if files:
+            return self.request_with_files(_resp, files, token, "PATCH", url_ending = req_url)
         return self.command_response(token, True, "PATCH", url_ending = req_url, json=_resp)
 
 

discord_slash/model.py

@@ -284,39 +284,59 @@ def __init__(self, *, state, channel, data, _http: http.SlashCommandRequest, int
         self._http = _http
         self.__interaction_token = interaction_token
 
+    async def _slash_edit(self, **fields):
+        """
+        An internal function
+        """
+        _resp = {}
+
+        content = fields.get("content")
+        if content:
+            _resp["content"] = str(content)
+
+        embed = fields.get("embed")
+        embeds = fields.get("embeds")
+        file = fields.get("file")
+        files = fields.get("files")
+
+        if embed and embeds:
+            raise error.IncorrectFormat("You can't use both `embed` and `embeds`!")
+        if file and files:
+            raise error.IncorrectFormat("You can't use both `file` and `files`!")
+        if file:
+            files = [file]
+        if embed:
+            embeds = [embed]
+        if embeds:
+            if not isinstance(embeds, list):
+                raise error.IncorrectFormat("Provide a list of embeds.")
+            elif len(embeds) > 10:
+                raise error.IncorrectFormat("Do not provide more than 10 embeds.")
+            _resp["embeds"] = [x.to_dict() for x in embeds]
+
+        allowed_mentions = fields.get("allowed_mentions")
+        _resp["allowed_mentions"] = allowed_mentions.to_dict() if allowed_mentions else \
+            self._state.allowed_mentions.to_dict() if self._state.allowed_mentions else {}
+
+        await self._http.edit(_resp, self.__interaction_token, self.id, files = files)
+
+        delete_after = fields.get("delete_after")
+        if delete_after:
+            await self.delete(delay=delete_after)
+        if files:
+            for file in files:
+                file.close()
+
+
     async def edit(self, **fields):
         """Refer :meth:`discord.Message.edit`."""
-        try:
-            await super().edit(**fields)
-        except discord.Forbidden:
-            _resp = {}
-
-            content = str(fields.get("content"))
-            if content:
-                _resp["content"] = str(content)
-
-            embed = fields.get("embed")
-            embeds = fields.get("embeds")
-            if embed and embeds:
-                raise error.IncorrectFormat("You can't use both `embed` and `embeds`!")
-            if embed:
-                embeds = [embed]
-            if embeds:
-                if not isinstance(embeds, list):
-                    raise error.IncorrectFormat("Provide a list of embeds.")
-                elif len(embeds) > 10:
-                    raise error.IncorrectFormat("Do not provide more than 10 embeds.")
-                _resp["embeds"] = [x.to_dict() for x in embeds]
-
-            allowed_mentions = fields.get("allowed_mentions")
-            _resp["allowed_mentions"] = allowed_mentions.to_dict() if allowed_mentions else \
-                self._state.allowed_mentions.to_dict() if self._state.allowed_mentions else {}
-
-            await self._http.edit(_resp, self.__interaction_token, self.id)
-
-            delete_after = fields.get("delete_after")
-            if delete_after:
-                await self.delete(delay=delete_after)
+        if "file" in fields or "files" in fields:
+            await self._slash_edit(**fields)
+        else:
+            try:
+                await super().edit(**fields)
+            except discord.Forbidden:
+                await self._slash_edit(**fields)
 
     async def delete(self, *, delay=None):
         """Refer :meth:`discord.Message.delete`."""