Merge pull request #293 from goverfl0w/pr-1

Reorder type listening + Menu/SlashContext confusion

Author: i0bs

discord_slash/client.py

@@ -1394,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)
@@ -1415,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)
@@ -1426,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
@@ -1462,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"]
@@ -1489,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.