Refactored RestartCommand

chesslablab · Oct 10, 2024 · f503132 · f503132
1 parent 6c5d04a
commit f503132
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/src/Command/Game/RestartCommand.php b/src/Command/Game/RestartCommand.php
@@ -6,9 +6,7 @@
 use Chess\Variant\Classical\PGN\AN\Color;
 use ChessServer\Command\AbstractCommand;
 use ChessServer\Command\Game\Game;
-use ChessServer\Command\Game\Mode\PlayMode;
 use ChessServer\Socket\AbstractSocket;
-use Firebase\JWT\JWT;
 
 class RestartCommand extends AbstractCommand
 {
@@ -41,23 +39,19 @@ public function run(AbstractSocket $socket, array $argv, int $id)
                 } else {
                     $game = new Game($result->variant, Game::MODE_PLAY);
                 }
-                $newGameMode = (new PlayMode(
-                    $game,
-                    $gameMode->getResourceIds(),
-                    JWT::encode((array) $result, $_ENV['JWT_SECRET'], 'HS256')
-                ))
-                ->setStatus(PlayMode::STATUS_ACCEPTED)
-                ->setStartedAt(time())
-                ->setUpdatedAt(time())
-                ->setTimer([
-                    Color::W => $result->min * 60,
-                    Color::B => $result->min * 60,
-                ]);
-                $socket->getGameModeStorage()->set($newGameMode);
-                return $socket->getClientStorage()->send($newGameMode->getResourceIds(), [
+                $gameMode->setGame($game)
+                    ->setJwt((array) $result)
+                    ->setStartedAt(time())
+                    ->setUpdatedAt(time())
+                    ->setTimer([
+                        Color::W => $result->min * 60,
+                        Color::B => $result->min * 60,
+                    ]);
+                $socket->getGameModeStorage()->set($gameMode);
+                return $socket->getClientStorage()->send($gameMode->getResourceIds(), [
                     $this->name => [
-                        'jwt' => $newGameMode->getJwt(),
-                        'timer' => $newGameMode->getTimer(),
+                        'jwt' => $gameMode->getJwt(),
+                        'timer' => $gameMode->getTimer(),
                     ],
                 ]);
             });