command handler register overhaul

Author: codemasher

src/Discord/Discord.php

@@ -1933,29 +1933,27 @@ public function getChannel($channel_id): ?Channel
      *
      * @return RegisteredCommand
      */
-    public function listenCommand($names, ?callable $callback = null, ?callable $autocomplete_callback = null): RegisteredCommand
+    public function listenCommand(array|string $names, ?callable $callback = null, ?callable $autocomplete_callback = null): RegisteredCommand
     {
-        if (! is_array($names)) {
+        if (is_string($names)) {
             $names = [$names];
         }
 
-        // registering base command
-        if (count($names) === 1) {
-            $name = array_shift($names);
-            if (isset($this->application_commands[$name])) {
-                throw new \LogicException("The command `{$name}` already exists.");
-            }
+        $baseCommand = array_shift($names);
 
-            return $this->application_commands[$name] = new RegisteredCommand($this, $name, $callback, $autocomplete_callback);
+        if (isset($this->application_commands[$baseCommand])) {
+            throw new \LogicException("The command `{$baseCommand}` already exists.");
         }
 
-        $baseCommand = array_shift($names);
+        // registering base command
+        $this->application_commands[$baseCommand] = new RegisteredCommand($this, $baseCommand, $callback, $autocomplete_callback);
 
-        if (! isset($this->application_commands[$baseCommand])) {
-            $this->listenCommand($baseCommand);
+        // register subcommands
+        foreach($names as $subCommand){
+            $this->application_commands[$baseCommand]->addSubCommand($subCommand, $callback, $autocomplete_callback);
         }
 
-        return $this->application_commands[$baseCommand]->addSubCommand($names, $callback, $autocomplete_callback);
+        return $this->application_commands[$baseCommand];
     }
 
     /**

src/Discord/Helpers/RegisteredCommand.php

@@ -177,28 +177,22 @@ public function getSubCommand(string $name): ?RegisteredCommand
      *
      * @return static
      */
-    public function addSubCommand($names, ?callable $callback = null, ?callable $autocomplete_callback = null): RegisteredCommand
+    public function addSubCommand(array|string $names, ?callable $callback = null, ?callable $autocomplete_callback = null): RegisteredCommand
     {
-        if (! is_array($names)) {
+        if (is_string($names)) {
             $names = [$names];
         }
 
-        if (count($names) === 1) {
-            $name = array_shift($names);
-            if (isset($this->subCommands[$name])) {
-                throw new \LogicException("The command `{$name}` already exists.");
-            }
-
-            return $this->subCommands[$name] = new static($this->discord, $name, $callback, $autocomplete_callback);
-        }
+        foreach($names as $subCommand){
 
-        $subCommand = array_shift($names);
+            if (isset($this->subCommands[$subCommand])) {
+                throw new \LogicException("The command `{$subCommand}` already exists.");
+            }
 
-        if (! isset($this->subCommands[$subCommand])) {
-            $this->addSubCommand($subCommand);
+            $this->subCommands[$subCommand] = new static($this->discord, $subCommand, $callback, $autocomplete_callback);
         }
 
-        return $this->subCommands[$subCommand]->addSubCommand($names, $callback, $autocomplete_callback);
+        return $this;
     }
 
     /**