Reorder type listening + fix mistaken Menu for SlashContext by internal checks.

+ Tested on cogs as well

Author: FayeDel

discord_slash/client.py

@@ -29,6 +29,8 @@ class SlashCommand:
     :type client: Union[discord.Client, discord.ext.commands.Bot]
     :param sync_commands: Whether to sync commands automatically. Default `False`.
     :type sync_commands: bool
+    :param debug_guild: Guild ID of guild to use for testing commands. Prevents setting global commands in favor of guild commands, which update instantly
+    :type debug_guild: int
     :param delete_from_unused_guilds: If the bot should make a request to set no commands for guilds that haven't got any commands registered in :class:``SlashCommand``. Default `False`.
     :type delete_from_unused_guilds: bool
     :param sync_on_cog_reload: Whether to sync commands on cog reload. Default `False`.
@@ -56,6 +58,7 @@ def __init__(
         self,
         client: typing.Union[discord.Client, commands.Bot],
         sync_commands: bool = False,
+        debug_guild: typing.Optional[int] = None,
         delete_from_unused_guilds: bool = False,
         sync_on_cog_reload: bool = False,
         override_type: bool = False,
@@ -68,6 +71,7 @@ def __init__(
         self.logger = logging.getLogger("discord_slash")
         self.req = http.SlashCommandRequest(self.logger, self._discord, application_id)
         self.sync_commands = sync_commands
+        self.debug_guild = debug_guild
         self.sync_on_cog_reload = sync_on_cog_reload
 
         if self.sync_commands:
@@ -424,7 +428,8 @@ async def sync_all_commands(
         permissions_map = {}
         cmds = await self.to_dict()
         self.logger.info("Syncing commands...")
-        cmds_formatted = {None: cmds["global"]}
+        # if debug_guild is set, global commands get re-routed to the guild to update quickly
+        cmds_formatted = {self.debug_guild: cmds["global"]}
         for guild in cmds["guild"]:
             cmds_formatted[guild] = cmds["guild"][guild]
 
@@ -1389,15 +1394,24 @@ async def on_socket_response(self, msg):
 
         to_use = msg["d"]
         interaction_type = to_use["type"]
-        if interaction_type in (1, 2, 3) or msg["s"] == 5:
+
+        # dis_snek variance seq
+
+        if interaction_type in (1, 2):
             await self._on_slash(to_use)
             await self._on_context_menu(to_use)
+        elif interaction_type == 3:
             try:
                 await self._on_component(to_use)  # noqa
             except KeyError:
                 pass  # for some reason it complains about custom_id being an optional arg when it's fine?
+            finally:
+                await self._on_context_menu(to_use)
+        else:
+            raise NotImplementedError(
+                f"Unknown Interaction Received: {interaction_type}"
+            )  # check if discord does a sneaky event change on us
         return
-        # raise NotImplementedError
 
     async def _on_component(self, to_use):
         ctx = context.ComponentContext(self.req, to_use, self._discord, self.logger)
@@ -1410,7 +1424,7 @@ async def _on_component(self, to_use):
             self._discord.dispatch("component_callback", ctx, callback)
             await self.invoke_component_callback(callback, ctx)
 
-    async def _on_slash(self, to_use):
+    async def _on_slash(self, to_use):  # slash commands only.
         if to_use["data"]["name"] in self.commands:
 
             ctx = context.SlashContext(self.req, to_use, self._discord, self.logger)
@@ -1421,6 +1435,9 @@ async def _on_slash(self, to_use):
 
             selected_cmd = self.commands[to_use["data"]["name"]]
 
+            if selected_cmd._type != 1:
+                return  # If its a menu, ignore.
+
             if (
                 selected_cmd.allowed_guild_ids
                 and ctx.guild_id not in selected_cmd.allowed_guild_ids
@@ -1457,6 +1474,12 @@ async def _on_slash(self, to_use):
             await self.invoke_command(selected_cmd, ctx, args)
 
     async def _on_context_menu(self, to_use):
+        # Slash Command Logic
+
+        # to prevent any potential keyerrors:
+        if "name" not in to_use["data"].keys():
+            return
+
         if to_use["data"]["name"] in self.commands["context"]:
             ctx = context.MenuContext(self.req, to_use, self._discord, self.logger)
             cmd_name = to_use["data"]["name"]
@@ -1484,6 +1507,39 @@ async def _on_context_menu(self, to_use):
 
             await self.invoke_command(selected_cmd, ctx, args={})
 
+        # Cog Logic
+
+        elif to_use["data"]["name"] in self.commands:
+            ctx = context.MenuContext(self.req, to_use, self._discord, self.logger)
+            cmd_name = to_use["data"]["name"]
+
+            if cmd_name not in self.commands and cmd_name in self.subcommands:
+                return  # menus don't have subcommands you smooth brain
+
+            selected_cmd = self.commands[cmd_name]
+            if type(selected_cmd) == dict:
+                return  # Get rid of any selection thats a dict somehow
+            if selected_cmd._type == 1:  # noqa
+                return  # Slash command obj.
+
+            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)
+
+            if "options" in to_use["data"]:
+                for x in to_use["data"]["options"]:
+                    if "value" not in x:
+                        return await self.handle_subcommand(ctx, to_use)
+
+            self._discord.dispatch("context_menu", ctx)
+
+            await self.invoke_command(selected_cmd, ctx, args={})
+
     async def handle_subcommand(self, ctx: context.SlashContext, data: dict):
         """
         Coroutine for handling subcommand.