Merge branch 'permissions' of https://github.com/benwoo1110/discord-py-slash-command into permissions

Author: benwoo1110

discord_slash/client.py

@@ -126,17 +126,7 @@ def get_cog_commands(self, cog: commands.Cog):
                             self.commands[x.base].allowed_guild_ids.append(i)
                     self.commands[x.base].has_subcommands = True
                 else:
-                    _cmd = {
-                        "func": None,
-                        "description": x.base_description,
-                        "auto_convert": {},
-                        "guild_ids": x.allowed_guild_ids.copy(),
-                        "api_options": [],
-                        "api_permissions": [],
-                        "has_subcommands": True,
-                        "connector": {}
-                    }
-                    self.commands[x.base] = model.BasecommandObject(x.base, _cmd)
+                    self.commands[x.base] = model.BasecommandObject(x.base, x.base_command_data)
                 if x.base not in self.subcommands:
                     self.subcommands[x.base] = {}
                 if x.subcommand_group:

discord_slash/cog_ext.py

@@ -71,6 +71,8 @@ def cog_subcommand(*,
                    description: str = None,
                    base_description: str = None,
                    base_desc: str = None,
+                   base_default_permission: bool = True,
+                   base_permissions: dict = None,
                    subcommand_group_description: str = None,
                    sub_group_desc: str = None,
                    guild_ids: typing.List[int] = None,
@@ -103,6 +105,10 @@ async def group_say(self, ctx: SlashContext, text: str):
     :param base_description: Description of the base command. Default ``None``.
     :type base_description: str
     :param base_desc: Alias of ``base_description``.
+    :param base_default_permission: Sets if users have permission to run slash command by default, when no permissions are set. Default ``True``.
+    :type base_default_permission: bool
+    :param base_permissions: Permission requirements of the slash command. Default ``None``.
+    :type base_permissions: dict
     :param subcommand_group_description: Description of the subcommand_group. Default ``None``.
     :type subcommand_group_description: str
     :param sub_group_desc: Alias of ``subcommand_group_description``.
@@ -123,6 +129,17 @@ def wrapper(cmd):
         else:
             opts = options
 
+        _cmd = {
+            "func": None,
+            "description": base_description,
+            "guild_ids": guild_ids.copy(),
+            "api_options": [],
+            "default_permission": base_default_permission,
+            "api_permissions": base_permissions,
+            "connector": {},
+            "has_subcommands": True
+        }
+
         _sub = {
             "func": cmd,
             "name": name or cmd.__name__,
@@ -133,5 +150,5 @@ def wrapper(cmd):
             "api_options": opts,
             "connector": connector
         }
-        return CogSubcommandObject(_sub, base, name or cmd.__name__, subcommand_group)
+        return CogSubcommandObject(base, _cmd, subcommand_group, name or cmd.__name__, _sub)
     return wrapper

discord_slash/model.py

@@ -255,8 +255,9 @@ class CogSubcommandObject(SubcommandObject):
         Do not manually init this model.
     """
 
-    def __init__(self, *args):
-        super().__init__(*args)
+    def __init__(self, base, cmd, sub_group, name, sub):
+        super().__init__(sub, base, name, sub_group)
+        self.base_command_data = cmd
         self.cog = None  # Manually set this later.
 
     async def invoke(self, *args, **kwargs):