Tweak

lichess-org · Nov 14, 2024 · d7161d6 · d7161d6
1 parent 5874914
commit d7161d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/lib/src/model/correspondence/offline_correspondence_game.dart b/lib/src/model/correspondence/offline_correspondence_game.dart
@@ -72,7 +72,6 @@ class OfflineCorrespondenceGame
     return null;
   }
 
-  bool get isPlayerTurn => lastPosition.turn == youAre;
   bool get playable => status.value < GameStatus.aborted.value;
   bool get playing => status.value > GameStatus.started.value;
   bool get finished => status.value >= GameStatus.mate.value;

diff --git a/lib/src/model/game/game_controller.dart b/lib/src/model/game/game_controller.dart
@@ -655,7 +655,7 @@ class GameController extends _$GameController {
 
         if (data.clock != null) {
           final lagCompensation =
-              newState.game.playable && newState.game.isPlayerTurn
+              newState.game.playable && newState.game.isMyTurn
                   // server will send the lag only if it's more than 10ms
                   ? Duration.zero
                   : data.clock?.lag ?? const Duration(milliseconds: 10);
@@ -668,12 +668,11 @@ class GameController extends _$GameController {
           );
 
           if (newState.game.clock != null) {
-            // TODO remove that
+            // we don't rely on these values to display the clock, but let's keep
+            // the game object in sync
             newState = newState.copyWith.game.clock!(
               white: data.clock!.white,
               black: data.clock!.black,
-              // lag: lagCompensation,
-              // at: data.clock!.at,
             );
           } else if (newState.game.correspondenceClock != null) {
             newState = newState.copyWith.game.correspondenceClock!(
@@ -1131,7 +1130,7 @@ class GameState with _$GameState {
       game.drawable && (lastDrawOfferAtPly ?? -99) < game.lastPly - 20;
 
   bool get canShowClaimWinCountdown =>
-      !game.isPlayerTurn &&
+      !game.isMyTurn &&
       game.resignable &&
       (game.meta.rules == null ||
           !game.meta.rules!.contains(GameRule.noClaimWin));

diff --git a/lib/src/model/game/playable_game.dart b/lib/src/model/game/playable_game.dart
@@ -95,7 +95,8 @@ class PlayableGame
 
   bool get imported => source == GameSource.import;
 
-  bool get isPlayerTurn => lastPosition.turn == youAre;
+  /// Whether it is the current player's turn.
+  bool get isMyTurn => lastPosition.turn == youAre;
 
   /// Whether the game is properly finished (not aborted).
   bool get finished => status.value >= GameStatus.mate.value;
@@ -125,7 +126,7 @@ class PlayableGame
 
   bool get canClaimWin =>
       opponent?.isGone == true &&
-      !isPlayerTurn &&
+      !isMyTurn &&
       resignable &&
       (meta.rules == null || !meta.rules!.contains(GameRule.noClaimWin));
 

diff --git a/lib/src/view/correspondence/offline_correspondence_game_screen.dart b/lib/src/view/correspondence/offline_correspondence_game_screen.dart
@@ -280,7 +280,7 @@ class _BodyState extends ConsumerState<_Body> {
                 data: (games) {
                   final nextTurn = games
                       .whereNot((g) => g.$2.id == game.id)
-                      .firstWhereOrNull((g) => g.$2.isPlayerTurn);
+                      .firstWhereOrNull((g) => g.$2.isMyTurn);
                   return nextTurn != null
                       ? () {
                           widget.onGameChanged(nextTurn);