Renamed some params #46

Author: eunwoo1104

discord_slash/client.py

@@ -92,7 +92,7 @@ def get_cog_commands(self, cog: commands.Cog):
                 else:
                     _cmd = {
                         "func": None,
-                        "description": x.base_desc,
+                        "description": x.base_description if x.base_description else "No Description.",
                         "auto_convert": {},
                         "guild_ids": x.allowed_guild_ids,
                         "api_options": [],
@@ -191,8 +191,8 @@ async def register_all_commands(self):
                                 "options": sub_sub.options if sub_sub.options else []
                             }
                             base_dict["options"].append(_dict)
-                            if sub_sub.sub_group_desc:
-                                base_dict["description"] = sub_sub.sub_group_desc
+                            if sub_sub.subcommand_group_description:
+                                base_dict["description"] = sub_sub.subcommand_group_description
                         options.append(base_dict)
                 if selected.allowed_guild_ids:
                     for y in selected.allowed_guild_ids:
@@ -317,8 +317,8 @@ def add_subcommand(self,
                        subcommand_group=None,
                        name=None,
                        description: str = None,
-                       base_desc: str = None,
-                       sub_group_desc: str = None,
+                       base_description: str = None,
+                       subcommand_group_description: str = None,
                        auto_convert: dict = None,
                        guild_ids: typing.List[int] = None,
                        options: list = None):
@@ -335,10 +335,10 @@ def add_subcommand(self,
         :type name: str
         :param description: Description of the subcommand. Default ``None``.
         :type description: str
-        :param base_desc: Description of the base command. Default ``None``.
-        :type base_desc: str
-        :param sub_group_desc: Description of the subcommand_group. Default ``None``.
-        :type sub_group_desc: str
+        :param base_description: Description of the base command. Default ``None``.
+        :type base_description: str
+        :param subcommand_group_description: Description of the subcommand_group. Default ``None``.
+        :type subcommand_group_description: str
         :param auto_convert: Dictionary of how to convert option values. Default ``None``.
         :type auto_convert: dict
         :param guild_ids: List of guild ID of where the command will be used. Default ``None``, which will be global command.
@@ -352,7 +352,7 @@ def add_subcommand(self,
         name = name.lower()
         _cmd = {
             "func": None,
-            "description": base_desc,
+            "description": base_description,
             "auto_convert": {},
             "guild_ids": guild_ids,
             "api_options": [],
@@ -362,8 +362,8 @@ def add_subcommand(self,
             "func": cmd,
             "name": name,
             "description": description,
-            "base_desc": base_desc,
-            "sub_group_desc": sub_group_desc,
+            "base_desc": base_description,
+            "sub_group_desc": subcommand_group_description,
             "auto_convert": auto_convert,
             "guild_ids": guild_ids,
             "api_options": options if options else []
@@ -470,8 +470,8 @@ def subcommand(self,
                    subcommand_group=None,
                    name=None,
                    description: str = None,
-                   base_desc: str = None,
-                   sub_group_desc: str = None,
+                   base_description: str = None,
+                   subcommand_group_description: str = None,
                    auto_convert: dict = None,
                    guild_ids: typing.List[int] = None,
                    options: typing.List[dict] = None):
@@ -505,10 +505,10 @@ async def _group_kick_user(ctx, user):
         :type name: str
         :param description: Description of the subcommand. Default ``None``.
         :type description: str
-        :param base_desc: Description of the base command. Default ``None``.
-        :type base_desc: str
-        :param sub_group_desc: Description of the subcommand_group. Default ``None``.
-        :type sub_group_desc: str
+        :param base_description: Description of the base command. Default ``None``.
+        :type base_description: str
+        :param subcommand_group_description: Description of the subcommand_group. Default ``None``.
+        :type subcommand_group_description: str
         :param auto_convert: Dictionary of how to convert option values. Default ``None``.
         :type auto_convert: dict
         :param guild_ids: List of guild ID of where the command will be used. Default ``None``, which will be global command.
@@ -526,7 +526,7 @@ async def _group_kick_user(ctx, user):
                 auto_convert[x["name"]] = x["type"]
 
         def wrapper(cmd):
-            self.add_subcommand(cmd, base, subcommand_group, name, description, base_desc, sub_group_desc, auto_convert, guild_ids, options)
+            self.add_subcommand(cmd, base, subcommand_group, name, description, base_description, subcommand_group_description, auto_convert, guild_ids, options)
             return cmd
 
         return wrapper

discord_slash/model.py

@@ -216,8 +216,8 @@ class SubcommandObject:
     :ivar name: Name of the subcommand.
     :ivar func: The coroutine of the command.
     :ivar description: Description of the command.
-    :ivar base_desc: Description of the base command.
-    :ivar sub_group_desc: Description of the subcommand_group.
+    :ivar base_description: Description of the base command.
+    :ivar subcommand_group_description: Description of the subcommand_group.
     :ivar auto_convert: Dictionary of the `auto_convert` of the command.
     :ivar allowed_guild_ids: List of the allowed guild id.
     """
@@ -227,8 +227,8 @@ def __init__(self, sub, base, name, sub_group=None):
         self.name = name.lower()
         self.func = sub["func"]
         self.description = sub["description"]
-        self.base_desc = sub["base_desc"]
-        self.sub_group_desc = sub["sub_group_desc"]
+        self.base_description = sub["base_desc"]
+        self.subcommand_group_description = sub["sub_group_desc"]
         self.auto_convert = sub["auto_convert"] if sub["auto_convert"] else {}
         self.allowed_guild_ids = sub["guild_ids"] if sub["guild_ids"] else []
         self.options = sub["api_options"] if sub["api_options"] else []