Merge pull request #105 from robotic-coder/master

Fixes and optimisations mainly for guilds with only the applications.commands scope

Author: eunwoo1104

discord_slash/client.py

@@ -722,11 +722,8 @@ async def on_socket_response(self, msg):
 
             selected_cmd = self.commands[to_use["data"]["name"]]
 
-            if selected_cmd.allowed_guild_ids:
-                guild_id = ctx.guild.id if isinstance(ctx.guild, discord.Guild) else ctx.guild
-
-                if guild_id not in selected_cmd.allowed_guild_ids:
-                    return
+            if selected_cmd.allowed_guild_ids and ctx.guild_id not in selected_cmd.allowed_guild_ids:
+                return
 
             if selected_cmd.has_subcommands and not selected_cmd.func:
                 return await self.handle_subcommand(ctx, to_use)

discord_slash/context.py

@@ -91,7 +91,7 @@ async def respond(self, eat: bool = False):
         base = {"type": 2 if eat else 5}
         _task = self.bot.loop.create_task(self._http.post(base, self.interaction_id, self.__token, True))
         self.sent = True
-        if not eat:
+        if not eat and (not self.guild_id or (self.channel and self.channel.permissions_for(self.guild.me).view_channel)):
             with suppress(asyncio.TimeoutError):
                 def check(message: discord.Message):
                     user_id = self.author_id
@@ -184,7 +184,7 @@ async def send(self,
         resp = await self._http.post(base, self.interaction_id, self.__token, files=files)
         smsg = model.SlashMessage(state=self.bot._connection,
                                   data=resp,
-                                  channel=self.channel or discord.Object(id=self.channel),
+                                  channel=self.channel or discord.Object(id=self.channel_id),
                                   _http=self._http,
                                   interaction_token=self.__token)
         if delete_after: