Added response delete/edit

Author: eunwoo1104

discord_slash/client.py

@@ -112,6 +112,8 @@ def process_options(self, guild: discord.Guild, options: list, auto_convert: dic
         if not guild:
             self.logger.info("This command invoke is missing guild. Skipping option process.")
             return [x["value"] for x in options]
+        if not auto_convert:
+            return [x["value"] for x in options]
         converters = [guild.get_member, guild.get_role, guild.get_role]
         types = {
             "user": 0,

discord_slash/http.py

@@ -6,20 +6,60 @@ class SlashCommandRequest:
     def __init__(self):
         pass
 
-    async def post(self, _resp, _id, token):
+    async def post(self, _resp, bot_id, interaction_id, token, initial=False) -> None:
         """
         Sends command response POST request to Discord API.
 
         :param _resp: Command response.
         :type _resp: dict
-        :param _id: Command message id.
+        :param bot_id: Bot ID.
+        :param interaction_id: Interaction ID.
         :param token: Command message token.
-        :return: True if succeeded.
+        :param initial: Whether this request is initial. Default ``False``
+        :return: ``None``, since Discord API doesn't return anything.
         :raises: :class:`.error.RequestFailure` - Requesting to API has failed.
         """
-        req_url = f"https://discord.com/api/v8/interactions/{_id}/{token}/callback"
+        req_url = f"https://discord.com/api/v8/interactions/{interaction_id}/{token}/callback" \
+            if initial \
+            else f"https://discord.com/api/v8/webhooks/{bot_id}/{token}"
         async with aiohttp.ClientSession() as session:
             async with session.post(req_url, json=_resp) as resp:
+                if not 200 <= resp.status < 300:
+                    raise RequestFailure(resp.status, await resp.text())
+                return None
+
+    async def edit(self, _resp, bot_id, token, message_id="@original"):
+        """
+        Sends edit command response POST request to Discord API.
+
+        :param _resp: Edited response.
+        :type _resp: dict
+        :param bot_id: Bot ID.
+        :param token: Command message token.
+        :param message_id: Message ID to edit. Default initial message.
+        :return: True if succeeded.
+        :raises: :class:`.error.RequestFailure` - Requesting to API has failed.
+        """
+        req_url = f"https://discord.com/api/v8/webhooks/{bot_id}/{token}/messages/{message_id}"
+        async with aiohttp.ClientSession() as session:
+            async with session.patch(req_url, json=_resp) as resp:
+                if not 200 <= resp.status < 300:
+                    raise RequestFailure(resp.status, await resp.text())
+                return True
+
+    async def delete(self, bot_id, token, message_id="@original"):
+        """
+        Sends delete command response POST request to Discord API.
+
+        :param bot_id: Bot ID.
+        :param token: Command message token.
+        :param message_id: Message ID to delete. Default initial message.
+        :return: True if succeeded.
+        :raises: :class:`.error.RequestFailure` - Requesting to API has failed.
+        """
+        req_url = f"https://discord.com/api/v8/webhooks/{bot_id}/{token}/messages/{message_id}"
+        async with aiohttp.ClientSession() as session:
+            async with session.delete(req_url) as resp:
                 if not 200 <= resp.status < 300:
                     raise RequestFailure(resp.status, await resp.text())
                 return True

discord_slash/model.py

@@ -2,6 +2,7 @@
 import discord
 from discord.ext import commands
 from . import http
+from . import error
 
 
 class SlashContext:
@@ -13,6 +14,8 @@ class SlashContext:
     :ivar interaction_id: Interaction ID of the command message.
     :ivar command_id: ID of the command.
     :ivar _http: :class:`.http.SlashCommandRequest` of the client.
+    :ivar _discord: :class:`discord.ext.commands.Bot`
+    :ivar sent: Whether you sent the initial response.
     :ivar guild: :class:`discord.Guild` instance of the command message.
     :ivar author: :class:`discord.Member` instance representing author of the command message.
     :ivar channel: :class:`discord.TextChannel` instance representing channel of the command message.
@@ -26,6 +29,8 @@ def __init__(self,
         self.interaction_id = _json["id"]
         self.command_id = _json["data"]["id"]
         self._http = _http
+        self._discord = _discord
+        self.sent = False
         self.guild: discord.Guild = _discord.get_guild(int(_json["guild_id"]))
         self.author: discord.Member = self.guild.get_member(int(_json["member"]["user"]["id"])) if self.guild else None
         self.channel = self.guild.get_channel(int(_json["channel_id"])) if self.guild else None
@@ -46,10 +51,10 @@ async def send(self,
         :type embeds: List[discord.Embed]
         :param tts: Whether to speak message using tts. Default ``False``.
         :type tts: bool
-        :return: `None`
+        :return: ``None``
         """
         if embeds and len(embeds) > 10:
-            raise
+            raise error.IncorrectFormat("Embed must be 10 or fewer.")
         base = {
             "type": send_type,
             "data": {
@@ -59,7 +64,52 @@ async def send(self,
                 "allowed_mentions": []
             }
         }
-        await self._http.post(base, self.interaction_id, self.__token)
+        initial = True if not self.sent else False
+        resp = await self._http.post(base, self._discord.user.id, self.interaction_id, self.__token, initial)
+        self.sent = True
+        return resp
+
+    async def edit(self,
+                   message_id: typing.Union[int, str] = "@original",
+                   send_type: int = 4,
+                   text: str = "",
+                   embeds: typing.List[discord.Embed] = None,
+                   tts: bool = False):
+        """
+        Edits response of the slash command.
+
+        :param message_id: Response message ID. Default initial message.
+        :param send_type: Type of the response. Refer Discord API DOCS for more info about types. Default ``4``.
+        :type send_type: int
+        :param text: Text of the response. Can be ``None``.
+        :type text: str
+        :param embeds: Embeds of the response. Maximum 10, can be empty.
+        :type embeds: List[discord.Embed]
+        :param tts: Whether to speak message using tts. Default ``False``.
+        :type tts: bool
+        :return: ``None``
+        """
+        if embeds and len(embeds) > 10:
+            raise error.IncorrectFormat("Embed must be 10 or fewer.")
+        base = {
+            "type": send_type,
+            "data": {
+                "tts": tts,
+                "content": text,
+                "embeds": [x.to_dict() for x in embeds] if embeds else [],
+                "allowed_mentions": []
+            }
+        }
+        await self._http.edit(base, self._discord.user.id, self.__token, message_id)
+
+    async def delete(self, message_id: typing.Union[int, str] = "@original"):
+        """
+        Deletes response of the slash command.
+
+        :param message_id: Response message ID. Default initial message.
+        :return: ``None``
+        """
+        await self._http.delete(self._discord.user.id, self.__token, message_id)
 
 
 """