Merge branch 'master' into anothercat/files-in-edit

Author: quirky-bluejay

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,5 +13,5 @@ What changes were made?
     - Issue:
 - [ ] This adds something new.
 - [ ] There is/are breaking change(s).
-- [ ] (If required) Relavent documentation has been updated/added.
+- [ ] (If required) Relevant documentation has been updated/added.
 - [ ] This is not a code change. (README, docs, etc.)

discord_slash/__init__.py

@@ -13,4 +13,4 @@
 from .context import SlashContext
 from .utils import manage_commands
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"

discord_slash/client.py

@@ -303,7 +303,7 @@ async def sync_all_commands(self, delete_from_unused_guilds=False):
         cmds = await self.to_dict()
         self.logger.info("Syncing commands...")
         other_guilds = [x.id for x in self._discord.guilds if x.id not in cmds["guild"]]
-        # This is an extremly bad way to do this, because slash cmds can be in guilds the bot isn't in
+        # This is an extremely bad way to do this, because slash cmds can be in guilds the bot isn't in
         # But it's the only way until discord makes an endpoint to request all the guild with cmds registered.
 
         await self.req.put_slash_commands(slash_commands=cmds["global"], guild_id=None)
@@ -838,5 +838,5 @@ async def on_slash_command_error(ctx, ex):
         if hasattr(self._discord, "on_slash_command_error"):
             self._discord.dispatch("slash_command_error", ctx, ex)
             return
-        # Prints exception if not overrided or has no listener for error.
+        # Prints exception if not overridden or has no listener for error.
         self.logger.exception(f"An exception has occurred while executing command `{ctx.name}`:")

discord_slash/context.py

@@ -1,5 +1,7 @@
 import typing
 import asyncio
+from warnings import warn
+
 import discord
 from contextlib import suppress
 from discord.ext import commands
@@ -27,8 +29,8 @@ class SlashContext:
     :ivar bot: discord.py client.
     :ivar _http: :class:`.http.SlashCommandRequest` of the client.
     :ivar _logger: Logger instance.
-    :ivar deffered: Whether the command is current deffered (loading state)
-    :ivar _deffered_hidden: Internal var to check that state stays the same
+    :ivar deferred: Whether the command is current deferred (loading state)
+    :ivar _deferred_hidden: Internal var to check that state stays the same
     :ivar responded: Whether you have responded with a message to the interaction.
     :ivar guild_id: Guild ID of the command message. If the command was invoked in DM, then it is ``None``
     :ivar author_id: User ID representing author of the command message.
@@ -53,9 +55,9 @@ def __init__(self,
         self._http = _http
         self.bot = _discord
         self._logger = logger
-        self.deffered = False
+        self.deferred = False
         self.responded = False
-        self._deffered_hidden = False  # To check if the patch to the deffered response matches
+        self._deferred_hidden = False  # To check if the patch to the deferred response matches
         self.guild_id = int(_json["guild_id"]) if "guild_id" in _json.keys() else None
         self.author_id = int(_json["member"]["user"]["id"] if "member" in _json.keys() else _json["user"]["id"])
         self.channel_id = int(_json["channel_id"])
@@ -66,6 +68,26 @@ def __init__(self,
         else:
             self.author = discord.User(data=_json["user"], state=self.bot._connection)
 
+    @property
+    def _deffered_hidden(self):
+        warn("`_deffered_hidden` as been renamed to `_deferred_hidden`.", DeprecationWarning, stacklevel=2)
+        return self._deferred_hidden
+
+    @_deffered_hidden.setter
+    def _deffered_hidden(self, value):
+        warn("`_deffered_hidden` as been renamed to `_deferred_hidden`.", DeprecationWarning, stacklevel=2)
+        self._deferred_hidden = value
+
+    @property
+    def deffered(self):
+        warn("`deffered` as been renamed to `deferred`.", DeprecationWarning, stacklevel=2)
+        return self.deferred
+
+    @deffered.setter
+    def deffered(self, value):
+        warn("`deffered` as been renamed to `deferred`.", DeprecationWarning, stacklevel=2)
+        self.deferred = value
+
     @property
     def guild(self) -> typing.Optional[discord.Guild]:
         """
@@ -86,18 +108,18 @@ def channel(self) -> typing.Optional[typing.Union[discord.TextChannel, discord.D
 
     async def defer(self, hidden: bool = False):
         """
-        'Deferes' the response, showing a loading state to the user
+        'Defers' the response, showing a loading state to the user
 
-        :param hidden: Whether the deffered response should be ephemeral . Default ``False``.
+        :param hidden: Whether the deferred response should be ephemeral . Default ``False``.
         """
-        if self.deffered or self.responded:
+        if self.deferred or self.responded:
             raise error.AlreadyResponded("You have already responded to this command!")
         base = {"type": 5}
         if hidden:
             base["data"] = {"flags": 64}
-            self._deffered_hidden = True
+            self._deferred_hidden = True
         await self._http.post_initial_response(base, self.interaction_id, self.__token)
-        self.deffered = True
+        self.deferred = True
 
     async def send(self,
                    content: str = "", *,
@@ -167,20 +189,26 @@ async def send(self,
             if embeds or files:
                 self._logger.warning("Embed/File is not supported for `hidden`!")
             base["flags"] = 64
-        
+
         initial_message = False
         if not self.responded:
             initial_message = True
-            if files and not self.deffered:
+            if files and not self.defered:
                 await self.defer(hidden=hidden)
-            if self.deffered:
-                if self._deffered_hidden != hidden:
+            if self.defered:
+                if self._defered_hidden != hidden:
+            if files:
+                raise error.IncorrectFormat("You cannot send files in the initial response!")
+            if self.deferred:
+                if self._deferred_hidden != hidden:
                     self._logger.warning(
-                        "Deffered response might not be what you set it to! (hidden / visible) "
-                        "This is because it was deffered in a different state"
+                        "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, files = files)
-                self.deffered = False
+                self.defered = False
+                resp = await self._http.edit(base, self.__token)
+                self.deferred = False
             else:
                 json_data = {
                     "type": 4,

docs/migration.rst

@@ -4,15 +4,15 @@ This page contains instructions on how to migrate between versions with breaking
 
 Migrate To V1.1.0
 ==================
-Changes that you'll need to make in this version are mainly becuase of a new ui from discord, more info `here <https://github.com/discord/discord-api-docs/pull/2615>`_
+Changes that you'll need to make in this version are mainly because of a new ui from discord, more info `here <https://github.com/discord/discord-api-docs/pull/2615>`_
 
 Responding / Deferring
 **********************
 
-In regards to :class:`SlashContext` the methods ``.respond`` and ``.ack`` have been removed, and ``.defer`` added. 
+In regards to :class:`SlashContext` the methods ``.respond`` and ``.ack`` have been removed, and ``.defer`` added.
 Deferring a message will allow you to respond for up to 15 mins, but you'll have to defer within three seconds.
-When you defer the user will see a "this bot is thinking" message until you send a message, This message can be ephermical (hidden) or visible.
-``.defer`` has a ``hidden`` parameter, which will make the deferred message ephermical.
+When you defer the user will see a "this bot is thinking" message until you send a message, This message can be ephemeral (hidden) or visible.
+``.defer`` has a ``hidden`` parameter, which will make the deferred message ephemeral.
 
 We suggest deferring if you might take more than three seconds to respond, but if you will call ``.send`` before three seconds then don't.
 
@@ -33,7 +33,7 @@ Example
     async def command(ctx, ...):
         await ctx.respond()
         await ctx.send(...)
-    
+
     # After 1
     @slash.slash(...)
     async def command(ctx, ...):
@@ -46,7 +46,7 @@ Example
         # Process that takes time
         await ctx.send(...)
 
-    
+
 Sending hidden messages
 ***********************
 The method ``.send_hidden`` on :class:`SlashContext` has been removed. Use ``.send(hidden = True, ..)`` instead.

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="discord-py-slash-command",
-    version="1.1.0",
+    version="1.1.1",
     author="eunwoo1104",
     author_email="sions04@naver.com",
     description="A simple discord slash command handler for discord.py.",