From 1ee463e93e7b8bdec9974b9cf7c3d230e90527eb Mon Sep 17 00:00:00 2001
From: jbock <jbock-java@gmx.de>
Date: Mon, 14 Oct 2024 09:42:36 +0200
Subject: [PATCH] fix review after timeout

do not show count result while reviewing
---
 src/main/client/src/feature/game/Game.jsx      | 12 ++++++++++++
 src/main/client/src/feature/game/GamePanel.jsx |  2 +-
 src/main/client/src/feature/game/state.js      | 16 ++++++++++++----
 src/main/java/com/bernd/GameController.java    |  2 ++
 src/main/java/com/bernd/model/Game.java        |  4 ++--
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/main/client/src/feature/game/Game.jsx b/src/main/client/src/feature/game/Game.jsx
index 86b48e5..880ee80 100644
--- a/src/main/client/src/feature/game/Game.jsx
+++ b/src/main/client/src/feature/game/Game.jsx
@@ -35,6 +35,8 @@ import {
   initialState,
   addMove,
   createGameState,
+  isCounting,
+  gameHasEnded,
 } from "./state.js"
 import {
   Board,
@@ -78,6 +80,16 @@ export function Game() {
       return
     }
     intervalIdRef.current = setInterval(() => {
+      let gameState = gameStateRef.current
+      if (!gameState) {
+        return
+      }
+      if (isCounting(gameState) || gameHasEnded(gameState)) {
+        if (intervalIdRef.current) {
+          clearInterval(intervalIdRef.current)
+        }
+        return
+      }
       let t = timeRemainingRef.current - 1
       setTimeRemaining(t)
       if (t <= 0) {
diff --git a/src/main/client/src/feature/game/GamePanel.jsx b/src/main/client/src/feature/game/GamePanel.jsx
index 3719d48..a375cbd 100644
--- a/src/main/client/src/feature/game/GamePanel.jsx
+++ b/src/main/client/src/feature/game/GamePanel.jsx
@@ -142,7 +142,7 @@ function WarpControls({gameState, setGameState, activePlay}) {
       </div>
       {!activePlay && (
         <Button title="Forward"
-          disabled={activePlay || isAtEnd(gameState)}
+          disabled={isAtEnd(gameState)}
           onClick={() => setGameState(moveForward(gameState))}
           className="py-1 px-2">
           Forward
diff --git a/src/main/client/src/feature/game/state.js b/src/main/client/src/feature/game/state.js
index 1e4649a..91a8321 100644
--- a/src/main/client/src/feature/game/state.js
+++ b/src/main/client/src/feature/game/state.js
@@ -119,6 +119,9 @@ export function gameHasEnded({state, moves}) {
 }
 
 export function isReviewing(baseState) {
+  if (gameHasEnded(baseState)) {
+    return true
+  }
   return baseState.viewPos < baseState.queueLength
 }
 
@@ -174,10 +177,11 @@ function goToEnd(baseState) {
   let queueLength = baseState.queueLength
   let baseBoard = baseState.baseBoard
   let historyBoard = baseState.historyBoard
+  let counting = baseState.state === STATE_COUNTING
   for (let i = baseState.viewPos; i < moves.length; i++) {
     let move = moves[i]
     let previousMove = getMove(moves, i - 1)
-    let [, updated] = updateBoardState(baseBoard, previousMove, move, !baseState.winnerByTime)
+    let [, updated] = updateBoardState(baseBoard, previousMove, move, counting)
     baseBoard = updated
   }
   let board = rehydrate(baseBoard, historyBoard)
@@ -202,8 +206,12 @@ export function addMove(baseState, move) {
     })
   }
   if (action === "end") {
+    let updated = resetCounting(baseBoard)
     return produce(baseState, (draft) => {
       draft.moves.push(move)
+      draft.state = 0
+      draft.baseBoard = updated
+      draft.board = rehydrate(updated, historyBoard)
     })
   }
   let [storedMove, updated, forbidden] = updateBoardState(baseBoard, previousMove, move, counting)
@@ -216,9 +224,9 @@ export function addMove(baseState, move) {
     draft.moves.push(storedMove)
     draft.lastMove = action === "pass" ? undefined : storedMove
     draft.baseBoard = updated
-    let updatedFinalBoard = counting ? historyBoard : updateHistoryBoard(historyBoard, move)
-    draft.historyBoard = updatedFinalBoard
-    draft.board = rehydrate(updated, updatedFinalBoard)
+    let updatedHistoryBoard = counting ? historyBoard : updateHistoryBoard(historyBoard, move)
+    draft.historyBoard = updatedHistoryBoard
+    draft.board = rehydrate(updated, updatedHistoryBoard)
     draft.forbidden = forbidden
     if (action === "pass" && previousMove?.action === "pass") {
       draft.state = STATE_COUNTING
diff --git a/src/main/java/com/bernd/GameController.java b/src/main/java/com/bernd/GameController.java
index 1279f15..32672f3 100644
--- a/src/main/java/com/bernd/GameController.java
+++ b/src/main/java/com/bernd/GameController.java
@@ -93,6 +93,8 @@ public void action(Move move, Principal p) {
     int color = getColorFromGameState(game);
     Chat chat = chats.get(game.id());
     if (game.timesetting() != 0
+        && !game.isCounting()
+        && !game.gameHasEnded()
         && System.currentTimeMillis() > game.updated() + game.timesetting() * 1000L) {
       games.put(game.withTimeoutState());
       String text = color == Board.W ? "B+Time" : "W+Time";
diff --git a/src/main/java/com/bernd/model/Game.java b/src/main/java/com/bernd/model/Game.java
index 2b66e5a..ab01254 100644
--- a/src/main/java/com/bernd/model/Game.java
+++ b/src/main/java/com/bernd/model/Game.java
@@ -54,7 +54,7 @@ private Game updateInternal(Move move) {
       return toBuilder().build();
     }
     if (isCounting()) {
-      int[][] updated = move.resetCounting() ?
+      int[][] updated = (move.pass() || move.resetCounting()) ?
           Toggle.resetCounting(board) :
           Toggle.toggleStonesAt(board, move.x(), move.y());
       return toBuilder()
@@ -208,7 +208,7 @@ public boolean isForbidden(Move move) {
   public String getScore() {
     int w = 0;
     int b = 0;
-    for (int y = 0; y < board().length; y++) {
+    for (int y = 0; y < board.length; y++) {
       for (int x = 0; x < board[y].length; x++) {
         int color = board[y][x];
         if ((color & (Board.W | Board.TERRITORY_W)) != 0) {