Merge branch 'devel' into score_cheat_community_moderator_power

online-go · Oct 1, 2023 · 79dd0e5 · 79dd0e5
2 parents 8bfc967 + 4578ab4
commit 79dd0e5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
         "express": "^4.17.1",
         "express-http-proxy": "^1.6.0",
         "fork-ts-checker-webpack-plugin": "^8.0.0",
-        "goban": "=0.7.13",
+        "goban": "=0.7.15",
         "gulp": "^4.0.2",
         "gulp-clean-css": "^4.3.0",
         "gulp-eslint-new": "^1.7.1",

diff --git a/src/lib/misc.ts b/src/lib/misc.ts
@@ -201,7 +201,7 @@ export function getGameResultText(
         return "";
     }
     /* SGFs will encode the full result in the outcome */
-    if (/[+]/.test(outcome)) {
+    if (/[+]/.test(outcome) && !/Server Decision/.test(outcome)) {
         return outcome;
     }
 

diff --git a/src/views/Game/AIDemoReview.tsx b/src/views/Game/AIDemoReview.tsx
@@ -208,6 +208,9 @@ export function AIDemoReview({
                             uuid: uuid(),
                             channel_id: `ai-position-analysis-stream-review-${goban.review_id}`,
                             rules: engine.rules,
+                            black_prisoners: goban.engine?.getBlackPrisoners() || 0,
+                            white_prisoners: goban.engine?.getWhitePrisoners() || 0,
+                            komi: goban.engine?.komi || 0,
                             board: move.state.board,
                             player: move.state.player,
                         })

diff --git a/src/views/ReportsCenter/MessageTemplate.tsx b/src/views/ReportsCenter/MessageTemplate.tsx
@@ -42,7 +42,7 @@ export const WARNING_TEMPLATES: MessageTemplates = {
 
                 Please consider resigning games rather than letting them time
                 out, as this is fairer to your opponents than making them wait for
-                your clock to run out.`,
+                your clock to run out. Thank you.`,
             show_warning_button: true,
         },
     },

diff --git a/yarn.lock b/yarn.lock
@@ -5352,10 +5352,10 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-goban@=0.7.13:
-  version "0.7.13"
-  resolved "https://registry.yarnpkg.com/goban/-/goban-0.7.13.tgz#a17ca1ab1931dc8b313c72ca894cdfbea463a8e3"
-  integrity sha512-sKoHlvBiexrjYSDXPvmIeW/ciGJkOkuKOt2E2dLwmTFqF9yfUTcDGFXHTATDDLEJt8XrgLXCa1vD00pJYEtFlA==
+goban@=0.7.15:
+  version "0.7.15"
+  resolved "https://registry.yarnpkg.com/goban/-/goban-0.7.15.tgz#def8be0d41b7470a1246f5668519c7e0f6eb89e6"
+  integrity sha512-HwhOHzNK+DImwfeeOFHm4QoxTvf/CZ99ngPwqt9c6nHaRpiW/G6rVCHudokoNky40bxG/BsSaVmkBEcGRt/seA==
   dependencies:
     eventemitter3 "^5.0.0"