Added cog subcommand support

Author: eunwoo1104

README.md

@@ -26,24 +26,23 @@ Cog (__Not Recommended__):
 ```py
 import discord
 from discord.ext import commands
+from discord_slash import cog_ext
 from discord_slash import SlashCommand
 from discord_slash import SlashContext
 
 
 class Slash(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-        self.slash = SlashCommand(bot, override_type=True)
-        # Cog is only supported by commands ext, so just skip checking type.
+        if not hasattr(bot, "slash"):
+            # Creates new SlashCommand instance to bot if bot doesn't have.
+            self.bot.slash = SlashCommand(bot, override_type=True)
+        self.bot.slash.get_cog_commands(self)
 
-        # Make sure all commands should be inside `__init__`
-        # or some other functions that can put commands.
-        @self.slash.slash(name="test")
-        async def _test(ctx: SlashContext):
-            await ctx.send(content="Hello, World!")
-
-    def cog_unload(self):
-        self.slash.remove()
+    @cog_ext.cog_slash(name="test")
+    async def _test(self, ctx: SlashContext):
+        embed = discord.Embed(title="embed test")
+        await ctx.send(content="test", embeds=[embed])
 
 
 def setup(bot):
@@ -72,5 +71,4 @@ Or you can ask at [Discussions](https://github.com/eunwoo1104/discord-py-slash-c
 
 ## TODO
 - Rewrite `http.py` and webhook part (Maybe use discord.py's webhook support?)
-- Properly support Cog
 - Try supporting most of the features supported by discord.py commands extension

discord_slash/client.py

@@ -72,16 +72,30 @@ def get_cog_commands(self, cog: commands.Cog):
                 if x.base in self.commands.keys():
                     self.commands[x.base].allowed_guild_ids += x.allowed_guild_ids
                     self.commands[x.base].has_subcommands = True
+                else:
+                    _cmd = {
+                        "func": None,
+                        "description": "No description.",
+                        "auto_convert": {},
+                        "guild_ids": x.allowed_guild_ids,
+                        "api_options": [],
+                        "has_subcommands": True
+                    }
+                    self.commands[x.base] = model.CommandObject(x.base, _cmd)
                 if x.base not in self.subcommands.keys():
                     self.subcommands[x.base] = {}
                 if x.subcommand_group:
                     if x.subcommand_group not in self.subcommands:
                         self.subcommands[x.base][x.subcommand_group] = {}
-                    else:
-                        self.subcommands[x.base][x.subcommand_group][x.name] = x
+                    self.subcommands[x.base][x.subcommand_group][x.name] = x
                 else:
                     self.subcommands[x.base][x.name] = x
 
+    def remove_cog_commands(self, cog):
+        func_list = [getattr(cog, x) for x in dir(cog)]
+        res = [x for x in func_list if
+               isinstance(x, model.CogCommandObject) or isinstance(x, model.CogSubcommandObject)]
+
     async def register_all_commands(self):
         """
         Registers all slash commands except subcommands to Discord API.\n
@@ -188,7 +202,7 @@ def add_subcommand(self,
         name = name.lower()
         _cmd = {
             "func": None,
-            "description": description if description else "No description.",
+            "description": "No description.",
             "auto_convert": {},
             "guild_ids": guild_ids,
             "api_options": [],

discord_slash/cog_ext.py

@@ -1,5 +1,4 @@
 import typing
-from discord.ext import commands
 from .model import CogCommandObject, CogSubcommandObject
 
 
@@ -22,6 +21,20 @@ def wrapper(cmd):
     return wrapper
 
 
-def register_cog_slash(cls):
-    func_list = [getattr(cls, x) for x in dir(cls)]
-    return [x for x in func_list if isinstance(x, CogCommandObject) or isinstance(x, CogSubcommandObject)]
+def cog_subcommand(*,
+                   base,
+                   subcommand_group=None,
+                   name=None,
+                   description: str = None,
+                   auto_convert: dict = None,
+                   guild_ids: typing.List[int] = None):
+    def wrapper(cmd):
+        _sub = {
+            "func": cmd,
+            "name": name,
+            "description": description,
+            "auto_convert": auto_convert,
+            "guild_ids": guild_ids,
+        }
+        return CogSubcommandObject(_sub, base, name, subcommand_group)
+    return wrapper