Fix cat

Author: Exanlv

_index.php

@@ -7,6 +7,7 @@
 require './_shared.php';
 
 $token = env('TOKEN');
+$devGuild = env('DEV_GUILD');
 
 $log = new Logger('stability-bot');
 $log->pushHandler(new StreamHandler('php://stdout'));

_register-commands.php

@@ -11,6 +11,7 @@
 use Ragnarok\Fenrir\Parts\ApplicationCommand;
 use Ragnarok\Fenrir\Rest\Helpers\Command\CommandBuilder;
 use Ragnarok\Fenrir\Rest\Helpers\Command\CommandOptionBuilder;
+use React\Promise\PromiseInterface;
 
 use function React\Promise\all;
 
@@ -19,32 +20,49 @@
 $log = new Logger('stability-bot-command-registration');
 $log->pushHandler(new StreamHandler('php://stdout'));
 
+$devGuild = env('DEV_GUILD');
+
 $discord = (new Discord(env('TOKEN'), $log))
     ->withGateway(new Bitwise())
     ->withRest();
 
-$discord->gateway->events->once(Events::READY, function (Ready $ready) use ($discord) {
+$discord->gateway->events->once(Events::READY, function (Ready $ready) use ($devGuild, $discord) {
+    /** @var Discord $discord */
+
     $applicationId = $ready->application->id;
 
-    $discord->rest->globalCommand->getCommands($applicationId)->then(function (array $commands) use ($applicationId, $discord) {
+    $discord->rest->{$devGuild ? 'guildCommand' : 'globalCommand'}->getCommands(
+        ...array_filter([$devGuild, $applicationId])
+    )->then(function (array $commands) use ($applicationId, $devGuild, $discord) {
+        $delete = $devGuild ? function (string $commandId) use ($applicationId, $devGuild, $discord): PromiseInterface {
+            return $discord->rest->guildCommand->deleteApplicationCommand($applicationId, $devGuild, $commandId);
+        } : function (string $commandId) use ($applicationId, $devGuild, $discord): PromiseInterface {
+            return $discord->rest->globalCommand->deleteApplicationCommand($applicationId, $commandId);
+        };
+
         $deletions = array_map(
-            fn (ApplicationCommand $command) => $discord->rest->globalCommand->deleteApplicationCommand($applicationId, $command->id),
+            fn (ApplicationCommand $command) => $delete($command->id),
             $commands
         );
 
         return all($deletions);
-    })->then(function () use ($applicationId, $discord) {
+    })->then(function () use ($applicationId, $devGuild, $discord) {
         $commandRegistrations = [];
-        $commandRegistrations[] = $discord->rest->globalCommand->createApplicationCommand(
-            $applicationId,
+
+        $register = $devGuild ? function (CommandBuilder $commandBuilder) use ($discord, $devGuild, $applicationId, &$commandRegistrations) {
+            $commandRegistrations[] = $discord->rest->guildCommand->createApplicationCommand($applicationId, $devGuild, $commandBuilder);
+        } : function (CommandBuilder $commandBuilder) use ($discord, $applicationId, &$commandRegistrations) {
+            $commandRegistrations[] = $discord->rest->globalCommand->createApplicationCommand($applicationId, $commandBuilder);
+        };
+
+        $register(
             CommandBuilder::new()
                 ->setName('status')
                 ->setDescription('Generate a status report')
                 ->setType(ApplicationCommandTypes::CHAT_INPUT),
         );
 
-        $commandRegistrations[] = $discord->rest->globalCommand->createApplicationCommand(
-            $applicationId,
+        $register(
             CommandBuilder::new()
                 ->setName('cat')
                 ->setDescription('Cat')
@@ -57,8 +75,7 @@
                 ),
         );
 
-        $commandRegistrations[] = $discord->rest->globalCommand->createApplicationCommand(
-            $applicationId,
+        $register(
             CommandBuilder::new()
                 ->setName('duck')
                 ->setDescription('Quack')

_shared.php

@@ -7,7 +7,7 @@
 $lockFile = json_decode(file_get_contents('composer.lock'), true);
 
 $fenrirVersion = array_values(array_filter(
-    $lockFile['packages'], fn ($package) => $package['name'] === 'exan/fenrir'
+    $lockFile['packages'], fn ($package) => $package['name'] === 'ragnarok/fenrir'
 ))[0]['version'];
 
 $dotenv = Dotenv::createImmutable(__DIR__);

composer.json

@@ -6,7 +6,7 @@
         }
     },
     "require": {
-        "exan/fenrir": "dev-feature/http@dev",
+        "ragnarok/fenrir": "dev-feature/http-0.0.2@dev",
         "discord-php/http": "@dev",
         "vlucas/phpdotenv": "^5.5",
         "monolog/monolog": "^3.2",

composer.lock

@@ -24,14 +24,14 @@ private function __construct(private string $url)
      */
     public static function fetch(?LoopInterface $loop = null): PromiseInterface
     {
-        $url = self::BASE_URL . 'cat?json=true';
+        $url = self::BASE_URL . 'cat';
 
         $http = new Browser(loop: $loop);
 
-        return $http->get($url)->then(function (ResponseInterface $response) {
+        return $http->get($url, ['Accept' => 'application/json'])->then(function (ResponseInterface $response) {
             $body = json_decode((string) $response->getBody());
 
-            return new Cat(self::BASE_URL . 'cat/' . $body->_id);
+            return new Cat(self::BASE_URL . 'cat/' . $body->id);
         });
     }
 

src/Cat.php

@@ -8,8 +8,8 @@
 use Ragnarok\Fenrir\Interaction\CommandInteraction;
 use Ragnarok\Fenrir\Interaction\Helpers\InteractionCallbackBuilder;
 use Psr\Log\LoggerInterface;
+use Ragnarok\Fenrir\Command\AllCommandExtension;
 use Ragnarok\Fenrir\Command\CommandExtension;
-use Ragnarok\Fenrir\Command\GlobalCommandExtension;
 use Ragnarok\Fenrir\Constants\Events;
 use Ragnarok\Fenrir\Enums\InteractionCallbackType;
 use Ragnarok\Fenrir\Gateway\Events\Ready;
@@ -33,7 +33,7 @@ public function __construct(
             ->withRest();
 
         $this->discord->gateway->events->once(Events::READY, function (Ready $ready) {
-            $commandExtension = new GlobalCommandExtension($ready->application->id);
+            $commandExtension = new AllCommandExtension($ready->application->id);
 
             $this->discord->registerExtension($commandExtension);