Fix order and support subcommands

Author: PredaaA

discord_slash/client.py

@@ -339,14 +339,14 @@ async def on_socket_response(self, msg):
         if to_use["data"]["name"] in self.commands.keys():
             selected_cmd = self.commands[to_use["data"]["name"]]
             ctx = model.SlashContext(self.req, to_use, self._discord, self.logger)
-            await self._discord.dispatch("slash_command", to_use["data"]["name"], selected_cmd)
             if selected_cmd["guild_ids"]:
                 if ctx.guild.id not in selected_cmd["guild_ids"]:
                     return
             if selected_cmd["has_subcommands"]:
                 return await self.handle_subcommand(ctx, to_use)
             args = await self.process_options(ctx.guild, to_use["data"]["options"], selected_cmd["auto_convert"]) \
                 if "options" in to_use["data"] else []
+            await self._discord.dispatch("slash_command", to_use["data"]["name"], selected_cmd)
             await selected_cmd["func"](ctx, *args)
 
     async def handle_subcommand(self, ctx: model.SlashContext, data: dict):
@@ -375,9 +375,11 @@ async def handle_subcommand(self, ctx: model.SlashContext, data: dict):
                 selected = base[sub_name][sub_group]
                 args = await self.process_options(ctx.guild, x["options"], selected["auto_convert"]) \
                     if "options" in x.keys() else []
+                await self._discord.dispatch("slash_command", sub_name, selected)
                 await selected["func"](ctx, *args)
                 return
         selected = base[sub_name]
         args = await self.process_options(ctx.guild, sub_opts, selected["auto_convert"]) \
             if "options" in sub.keys() else []
+        await self._discord.dispatch("slash_command", sub_name, selected)
         await selected["func"](ctx, *args)