Updated PlayLanCommand

chesslablab · Oct 9, 2024 · 2c2e7dc · 2c2e7dc
1 parent 9246c4b
commit 2c2e7dc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 32 deletions.
diff --git a/src/Command/Game/Mode/PlayMode.php b/src/Command/Game/Mode/PlayMode.php
@@ -4,8 +4,6 @@
 
 use Chess\Variant\Classical\PGN\AN\Color;
 use ChessServer\Command\Game\Game;
-use ChessServer\Command\Game\PlayLanCommand;
-use ChessServer\Repository\User\UserRepository;
 
 class PlayMode extends AbstractMode
 {
@@ -80,7 +78,7 @@ public function setTimer(array $timer)
         return $this;
     }
 
-    protected function updateTimer(string $color)
+    public function updateTimer(string $color)
     {
         $now = time();
         $diff = $now - $this->updatedAt;
@@ -94,33 +92,4 @@ protected function updateTimer(string $color)
 
         $this->updatedAt = $now;
     }
-
-    public function res($params, $cmd)
-    {
-        switch (get_class($cmd)) {
-            case PlayLanCommand::class:
-                $isValid = $this->game->playLan($params['color'], $params['lan']);
-                if ($isValid) {
-                    if (isset($this->game->state()->end)) {
-                        (new UserRepository($this->pool))->updateElo(
-                            $this->game->state()->end['result'],
-                            $this->getJwtDecoded()
-                        );
-                    } else {
-                        $this->updateTimer($params['color']);
-                    }
-                }
-                return [
-                    $cmd->name => [
-                      ...(array) $this->game->state(),
-                      'variant' =>  $this->game->getVariant(),
-                      'timer' => $this->timer,
-                      'isValid' => $isValid,
-                    ],
-                ];
-
-            default:
-                return parent::res($params, $cmd);
-        }
-    }
 }
diff --git a/src/Command/Game/PlayLanCommand.php b/src/Command/Game/PlayLanCommand.php
@@ -3,6 +3,7 @@
 namespace ChessServer\Command\Game;
 
 use ChessServer\Command\AbstractCommand;
+use ChessServer\Command\Game\Mode\PlayMode;
 use ChessServer\Socket\AbstractSocket;
 
 class PlayLanCommand extends AbstractCommand
@@ -26,6 +27,26 @@ public function run(AbstractSocket $socket, array $argv, int $id)
         $params = json_decode(stripslashes($argv[1]), true);
         $gameMode = $socket->getGameModeStorage()->getById($id);
 
+        if (get_class($gameMode) === PlayMode::class) {
+            $isValid = $gameMode->getGame()->playLan($params['color'], $params['lan']);
+            if ($isValid) {
+                if (isset($gameMode->getGame()->state()->end)) {
+                    // TODO ...
+                    // Update elo
+                } else {
+                    $gameMode->updateTimer($params['color']);
+                }
+            }
+            return $socket->getClientStorage()->send($gameMode->getResourceIds(), [
+                $this->name => [
+                    ...(array) $gameMode->getGame()->state(),
+                    'variant' =>  $gameMode->getGame()->getVariant(),
+                    'timer' => $gameMode->getTimer(),
+                    'isValid' => $isValid,
+                ],
+            ]);
+        }
+
         return $socket->getClientStorage()->send(
             $gameMode->getResourceIds(),
             $gameMode->res($params, $this)