Merge pull request #16184 from allanjoseph98/clockToSpeed

use existing `clockToSpeed` function
lichess-org · Oct 7, 2024 · 0f7da32 · 0f7da32
2 parents fcd1950 + d193002
commit 0f7da32
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/ui/lobby/package.json b/ui/lobby/package.json
@@ -16,6 +16,7 @@
     "common": "workspace:*",
     "dasher": "workspace:*",
     "debounce-promise": "^3.1.2",
+    "game": "workspace:*",
     "snabbdom": "3.5.1"
   },
   "lichess": {

diff --git a/ui/lobby/src/setupCtrl.ts b/ui/lobby/src/setupCtrl.ts
@@ -2,6 +2,7 @@ import { Prop, propWithEffect } from 'common';
 import { debounce } from 'common/timing';
 import * as xhr from 'common/xhr';
 import { storedJsonProp, StoredJsonProp } from 'common/storage';
+import { clockToSpeed } from 'game';
 import LobbyController from './ctrl';
 import {
   ForceSetupOptions,
@@ -23,21 +24,12 @@ import {
   variants,
 } from './options';
 
-const getPerf = (variant: VariantKey, timeMode: TimeMode, time: RealValue, increment: RealValue): Perf => {
-  if (!['standard', 'fromPosition'].includes(variant)) return variant as Perf;
-  if (timeMode !== 'realTime') return 'correspondence';
-
-  const totalGameTime = time * 60 + increment * 40;
-  return totalGameTime < 30
-    ? 'ultraBullet'
-    : totalGameTime < 180
-      ? 'bullet'
-      : totalGameTime < 480
-        ? 'blitz'
-        : totalGameTime < 1500
-          ? 'rapid'
-          : 'classical';
-};
+const getPerf = (variant: VariantKey, timeMode: TimeMode, time: RealValue, increment: RealValue): Perf =>
+  variant != 'standard' && variant != 'fromPosition'
+    ? variant
+    : timeMode !== 'realTime'
+      ? 'correspondence'
+      : clockToSpeed(time * 60, increment);
 
 export default class SetupController {
   root: LobbyController;