🧑‍💻 Pass the resolved target to context menus (#107)

src/Commands/Command.php

@@ -70,7 +70,7 @@ public function maybeHandle($message, $args)
      *
      * @param  \Discord\Parts\Channel\Message  $message
      * @param  array  $args
-     * @return void
+     * @return mixed
      */
     abstract public function handle($message, $args);
 

src/Commands/ContextMenu.php

@@ -2,7 +2,10 @@
 
 namespace Laracord\Commands;
 
+use Discord\Parts\Channel\Message;
 use Discord\Parts\Interactions\Command\Command as DiscordCommand;
+use Discord\Parts\Interactions\Interaction;
+use Discord\Parts\User\User;
 use Laracord\Commands\Contracts\ContextMenu as ContextMenuContract;
 
 abstract class ContextMenu extends ApplicationCommand implements ContextMenuContract
@@ -32,22 +35,25 @@ public function create(): DiscordCommand
 
     /**
      * Handle the context menu interaction.
-     *
-     * @param  \Discord\Parts\Interactions\Interaction  $interaction
-     * @return void
      */
-    abstract public function handle($interaction);
+    abstract public function handle(Interaction $interaction, Message|User|null $target): mixed;
 
     /**
      * Maybe handle the context menu interaction.
      *
      * @param  \Discord\Parts\Interactions\Interaction  $interaction
-     * @return void
+     * @return mixed
      */
     public function maybeHandle($interaction)
     {
+        $target = match ($this->getType()) {
+            DiscordCommand::USER => $interaction->data->resolved->users?->first(),
+            DiscordCommand::MESSAGE => $interaction->data->resolved->messages?->first(),
+            default => null,
+        };
+
         if (! $this->isAdminCommand()) {
-            $this->handle($interaction);
+            $this->handle($interaction, $target);
 
             return;
         }
@@ -63,7 +69,7 @@ public function maybeHandle($interaction)
             );
         }
 
-        $this->handle($interaction);
+        $this->handle($interaction, $target);
     }
 
     /**

src/Commands/Contracts/ContextMenu.php

@@ -2,12 +2,14 @@
 
 namespace Laracord\Commands\Contracts;
 
+use Discord\Parts\Channel\Message;
 use Discord\Parts\Interactions\Interaction;
+use Discord\Parts\User\User;
 
 interface ContextMenu
 {
     /**
      * Handle the context menu interaction.
      */
-    public function handle(Interaction $interaction);
+    public function handle(Interaction $interaction, Message|User|null $target): mixed;
 }

src/Commands/SlashCommand.php

@@ -69,15 +69,15 @@ public function create(): DiscordCommand
      * Handle the slash command.
      *
      * @param  \Discord\Parts\Interactions\Interaction  $interaction
-     * @return void
+     * @return mixed
      */
     abstract public function handle($interaction);
 
     /**
      * Maybe handle the slash command.
      *
      * @param  \Discord\Parts\Interactions\Interaction  $interaction
-     * @return void
+     * @return mixed
      */
     public function maybeHandle($interaction)
     {

src/Console/Commands/MakeCommand.php

@@ -43,7 +43,11 @@ protected function replaceClass($stub, $name)
 
         $command = $this->option('command') ?: Str::of($name)->classBasename()->kebab()->value();
 
-        return str_replace(['dummy:command', '{{ command }}'], $command, $stub);
+        $title = Str::of($command)->replace('-', ' ')->apa();
+
+        $stub = str_replace(['dummy:command', '{{ command }}', '{{ title }}'], [$command, $command, $title], $stub);
+
+        return $stub;
     }
 
     /**

src/Console/Commands/MakeMenuCommand.php

@@ -43,7 +43,11 @@ protected function replaceClass($stub, $name)
 
         $command = $this->option('command') ?: Str::of($name)->classBasename()->kebab()->value();
 
-        return str_replace(['dummy:command', '{{ command }}'], $command, $stub);
+        $title = Str::of($command)->replace('-', ' ')->apa();
+
+        $stub = str_replace(['dummy:command', '{{ command }}', '{{ title }}'], [$command, $command, $title], $stub);
+
+        return $stub;
     }
 
     /**

src/Console/Commands/MakeSlashCommand.php

@@ -43,7 +43,11 @@ protected function replaceClass($stub, $name)
 
         $command = $this->option('command') ?: Str::of($name)->classBasename()->kebab()->value();
 
-        return str_replace(['dummy:command', '{{ command }}'], $command, $stub);
+        $title = Str::of($command)->replace('-', ' ')->apa();
+
+        $stub = str_replace(['dummy:command', '{{ command }}', '{{ title }}'], [$command, $command, $title], $stub);
+
+        return $stub;
     }
 
     /**

src/Console/Commands/stubs/command.stub

@@ -19,7 +19,7 @@ class {{ class }} extends Command
      *
      * @var string
      */
-    protected $description = 'The {{ command }} command.';
+    protected $description = 'The {{ title }} command.';
 
     /**
      * Determines whether the command requires admin permissions.
@@ -46,7 +46,7 @@ class {{ class }} extends Command
     {
         return $this
             ->message()
-            ->title('{{ class }}')
+            ->title('{{ title }}')
             ->content('Hello world!')
             ->button('👋', route: 'wave')
             ->send($message);

src/Console/Commands/stubs/context-menu.stub

@@ -2,7 +2,9 @@
 
 namespace {{ namespace }};
 
+use Discord\Parts\Channel\Message;
 use Discord\Parts\Interactions\Interaction;
+use Discord\Parts\User\User;
 use Laracord\Commands\ContextMenu;
 
 class {{ class }} extends ContextMenu
@@ -12,7 +14,7 @@ class {{ class }} extends ContextMenu
      *
      * @var string
      */
-    protected $name = '{{ command }}';
+    protected $name = '{{ title }}';
 
     /**
      * The context menu type.
@@ -35,16 +37,13 @@ class {{ class }} extends ContextMenu
 
     /**
      * Handle the context menu interaction.
-     *
-     * @param  \Discord\Parts\Interactions\Interaction  $interaction
-     * @return void
      */
-    public function handle($interaction)
+    public function handle(Interaction $interaction, Message|User|null $target): mixed
     {
         $interaction->respondWithMessage(
             $this
               ->message()
-              ->title('{{ class }}')
+              ->title('{{ title }}')
               ->content('Hello world!')
               ->button('👋', route: 'wave')
               ->build()

src/Console/Commands/stubs/event.stub

@@ -17,7 +17,7 @@ class {{ class }} extends Event
     /**
      * Handle the event.
      */
-    public function handle({{ attributes }})
+    public function handle({{ attributes }}): mixed
     {
         $this->console()->log('The {{ eventName }} event has fired!');
     }

src/Console/Commands/stubs/service.stub

@@ -14,7 +14,7 @@ class {{ class }} extends Service
     /**
      * Handle the service.
      */
-    public function handle(): void
+    public function handle(): mixed
     {
         $this->console()->log('Hello world.');
     }

src/Console/Commands/stubs/slash-command.stub

@@ -19,7 +19,7 @@ class {{ class }} extends SlashCommand
      *
      * @var string
      */
-    protected $description = 'The {{ command }} slash command.';
+    protected $description = 'The {{ title }} slash command.';
 
     /**
      * The command options.
@@ -53,14 +53,14 @@ class {{ class }} extends SlashCommand
      * Handle the slash command.
      *
      * @param  \Discord\Parts\Interactions\Interaction  $interaction
-     * @return void
+     * @return mixed
      */
     public function handle($interaction)
     {
         $interaction->respondWithMessage(
             $this
               ->message()
-              ->title('{{ class }}')
+              ->title('{{ title }}')
               ->content('Hello world!')
               ->button('👋', route: 'wave')
               ->build()

src/Services/Contracts/Service.php

@@ -6,6 +6,8 @@ interface Service
 {
     /**
      * Handle the service.
+     *
+     * @return mixed
      */
     public function handle();
 }

src/Services/Service.php

@@ -71,7 +71,7 @@ public static function make(Laracord $bot): self
     /**
      * Handle the service.
      *
-     * @return void
+     * @return mixed
      */
     abstract public function handle();