Merge branch 'master' into new-ui-changes

Author: quirky-bluejay

discord_slash/client.py

@@ -45,12 +45,13 @@ def __init__(self,
                  sync_commands: bool = False,
                  delete_from_unused_guilds: bool = False,
                  sync_on_cog_reload: bool = False,
-                 override_type: bool = False):
+                 override_type: bool = False,
+                 application_id: typing.Optional[int] = None):
         self._discord = client
         self.commands = {}
         self.subcommands = {}
         self.logger = logging.getLogger("discord_slash")
-        self.req = http.SlashCommandRequest(self.logger, self._discord)
+        self.req = http.SlashCommandRequest(self.logger, self._discord, application_id)
         self.sync_commands = sync_commands
         self.sync_on_cog_reload = sync_on_cog_reload
 

discord_slash/http.py

@@ -12,9 +12,14 @@ class CustomRoute(Route):
 
 
 class SlashCommandRequest:
-    def __init__(self, logger, _discord):
+    def __init__(self, logger, _discord, application_id):
         self.logger = logger
         self._discord: typing.Union[discord.Client, discord.AutoShardedClient] = _discord
+        self._application_id = application_id
+
+    @property
+    def application_id(self):
+        return self._application_id or self._discord.user.id
 
     def put_slash_commands(self, slash_commands: list, guild_id):
         """
@@ -73,7 +78,7 @@ def command_request(self, method, guild_id, url_ending="", **kwargs):
         :param url_ending: String to append onto the end of the url.
         :param \**kwargs: Kwargs to pass into discord.py's `request function <https://github.com/Rapptz/discord.py/blob/master/discord/http.py#L134>`_
         """
-        url = f"/applications/{self._discord.user.id}"
+        url = f"/applications/{self.application_id}"
         url += "/commands" if not guild_id else f"/guilds/{guild_id}/commands"
         url += url_ending
         route = CustomRoute(method, url)
@@ -120,12 +125,13 @@ def command_response(self, token, use_webhook, method, interaction_id= None, url
         """
         if not use_webhook and not interaction_id:
             raise error.IncorrectFormat("Internal Error! interaction_id must be set if use_webhook is False")
-        req_url = f"/webhooks/{self._discord.user.id}/{token}" if use_webhook else f"/interactions/{interaction_id}/{token}/callback"
+        req_url = f"/webhooks/{self.application_id}/{token}" if use_webhook else f"/interactions/{interaction_id}/{token}/callback"
         req_url += url_ending
         route = CustomRoute(method, req_url)
         return self._discord.http.request(route, **kwargs)
 
     def post_with_files(self, _resp, files: typing.List[discord.File], token):
+
         form = aiohttp.FormData()
         form.add_field("payload_json", json.dumps(_resp))
         for x in range(len(files)):
@@ -147,6 +153,7 @@ def edit(self, _resp, token, message_id="@original"):
         req_url = f"/messages/{message_id}"
         return self.command_response(token, True, "PATCH", url_ending = req_url, json=_resp)
 
+
     def delete(self, token, message_id="@original"):
         """
         Sends delete command response POST request to Discord API.
@@ -157,3 +164,4 @@ def delete(self, token, message_id="@original"):
         """
         req_url = f"/messages/{message_id}"
         return self.command_response(token, True, "DELETE", url_ending = req_url)
+