Rename to BaseCommandObject

Author: benwoo1110

discord_slash/client.py

@@ -112,10 +112,10 @@ def get_cog_commands(self, cog: commands.Cog):
                                        "to add cog slash commands. Make sure to remove all calls to this function.")
         cog._slash_registered = True  # Assuming all went well
         func_list = [getattr(cog, x) for x in dir(cog)]
-        res = [x for x in func_list if isinstance(x, (model.CogBasecommandObject, model.CogSubcommandObject))]
+        res = [x for x in func_list if isinstance(x, (model.CogBaseCommandObject, model.CogSubcommandObject))]
         for x in res:
             x.cog = cog
-            if isinstance(x, model.CogBasecommandObject):
+            if isinstance(x, model.CogBaseCommandObject):
                 if x.name in self.commands:
                     raise error.DuplicateCommand(x.name)
                 self.commands[x.name] = x
@@ -126,7 +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:
-                    self.commands[x.base] = model.BasecommandObject(x.base, x.base_command_data)
+                    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:
@@ -154,9 +154,9 @@ def remove_cog_commands(self, cog):
             del cog._slash_registered
         func_list = [getattr(cog, x) for x in dir(cog)]
         res = [x for x in func_list if
-               isinstance(x, (model.CogBasecommandObject, model.CogSubcommandObject))]
+               isinstance(x, (model.CogBaseCommandObject, model.CogSubcommandObject))]
         for x in res:
-            if isinstance(x, model.CogBasecommandObject):
+            if isinstance(x, model.CogBaseCommandObject):
                 if x.name not in self.commands:
                     continue  # Just in case it is removed due to subcommand.
                 if x.name in self.subcommands:
@@ -479,7 +479,7 @@ def add_slash_command(self,
             "connector": connector or {},
             "has_subcommands": has_subcommands
         }
-        obj = model.BasecommandObject(name, _cmd)
+        obj = model.BaseCommandObject(name, _cmd)
         self.commands[name] = obj
         self.logger.debug(f"Added command `{name}`")
         return obj
@@ -561,7 +561,7 @@ def add_subcommand(self,
             "connector": connector or {}
         }
         if base not in self.commands:
-            self.commands[base] = model.BasecommandObject(base, _cmd)
+            self.commands[base] = model.BaseCommandObject(base, _cmd)
         else:
             base_command = self.commands[base]
             base_command.has_subcommands = True

discord_slash/cog_ext.py

@@ -1,6 +1,6 @@
 import typing
 import inspect
-from .model import CogBasecommandObject, CogSubcommandObject
+from .model import CogBaseCommandObject, CogSubcommandObject
 from .utils import manage_commands
 
 
@@ -60,7 +60,7 @@ def wrapper(cmd):
             "connector": connector,
             "has_subcommands": False
         }
-        return CogBasecommandObject(name or cmd.__name__, _cmd)
+        return CogBaseCommandObject(name or cmd.__name__, _cmd)
     return wrapper
 
 

discord_slash/model.py

@@ -175,7 +175,7 @@ async def can_run(self, ctx) -> bool:
         return False not in res
 
 
-class BasecommandObject(CommandObject):
+class BaseCommandObject(CommandObject):
     """
     BaseCommand object of this extension.
 
@@ -221,7 +221,7 @@ def __init__(self, sub, base, name, sub_group=None):
         self.subcommand_group_description = sub["sub_group_desc"]
 
 
-class CogBasecommandObject(BasecommandObject):
+class CogBaseCommandObject(BaseCommandObject):
     """
     Slash command object but for Cog.