Merge branch 'master' into replay-embed

* master:
  remove lila-side ws redis monitoring which we hopefully won't need anymore
  tweak broadcast leaderboard style
  fix broadcast leaderboard display
  TS tweak
  New Crowdin updates (#11264)
  better type ui/puzzle
  don't use rejected promise for redirect

Author: ornicar

modules/common/src/main/mon.scala

@@ -486,17 +486,6 @@ object mon {
     def teamBulk(teamId: String) = histogram("msg.bulk.team").withTag("id", teamId)
     def clasBulk(clasId: String) = histogram("msg.bulk.clas").withTag("id", clasId)
   }
-  object ws {
-    val inCounter                       = counter("ws.in")
-    def in(chan: String, path: String)  = inCounter.withTags(Map("chan" -> chan, "path" -> path))
-    val siteInTellSriCounter            = counter("ws.in.site-in.tell-sri")
-    def siteInTellSri(typ: String)      = siteInTellSriCounter.withTag("typ", typ)
-    val outCounter                      = counter("ws.out")
-    def out(chan: String, path: String) = outCounter.withTags(Map("chan" -> chan, "path" -> path))
-    val outSuccessHistogram             = histogram("ws.out.success")
-    def outSuccess(chan: String, path: String) =
-      outSuccessHistogram.withTags(Map("chan" -> chan, "path" -> path))
-  }
   object puzzle {
     object selector {
       object user {

modules/socket/src/main/RemoteSocket.scala

@@ -58,7 +58,6 @@ final class RemoteSocket(
       // this shouldn't be necessary... ensure that users are known to be online
       onlineUserIds.getAndUpdate((x: UserIds) => x ++ lags.keys).unit
     case In.TellSri(sri, userId, typ, msg) =>
-      lila.mon.ws.siteInTellSri(typ).increment()
       Bus.publish(TellSriIn(sri.value, userId, msg), s"remoteSocketIn:$typ")
     case In.TellUser(userId, typ, msg) =>
       Bus.publish(TellUserIn(userId, msg), s"remoteSocketIn:$typ")
@@ -121,8 +120,8 @@ final class RemoteSocket(
   }
 
   final class StoppableSender(val conn: PubSub[String, String], channel: Channel) extends Sender {
-    def apply(msg: String): Unit               = if (!stopping) monitorAndSend(channel, msg)
-    def sticky(_id: String, msg: String): Unit = apply(msg)
+    def apply(msg: String)               = if (!stopping) send(channel, msg).unit
+    def sticky(_id: String, msg: String) = apply(msg)
   }
 
   final class RoundRobinSender(val conn: PubSub[String, String], channel: Channel, parallelism: Int)
@@ -141,12 +140,11 @@ final class RemoteSocket(
 
   private val send: Send = makeSender("site-out").apply _
 
-  def subscribe(channel: Channel, reader: In.Reader, monitor: Boolean = true)(handler: Handler): Funit =
+  def subscribe(channel: Channel, reader: In.Reader)(handler: Handler): Funit =
     connectAndSubscribe(channel) { str =>
       RawMsg(str) match {
         case None => logger.error(s"Invalid $channel $str")
         case Some(msg) =>
-          if (monitor) lila.mon.ws.in(channel, msg.path).increment()
           reader(msg) collect handler match {
             case Some(_) => // processed
             case None    => logger.warn(s"Unhandled $channel $str")
@@ -158,11 +156,11 @@ final class RemoteSocket(
       handler: Handler
   ): Funit =
     // subscribe to main channel
-    subscribe(channel, reader, monitor = false)(handler) >> {
+    subscribe(channel, reader)(handler) >> {
       // and subscribe to subchannels
       (0 to parallelism)
         .map { index =>
-          subscribe(s"$channel:$index", reader, monitor = false)(handler)
+          subscribe(s"$channel:$index", reader)(handler)
         }
         .sequenceFu
         .void
@@ -208,18 +206,7 @@ object RemoteSocket {
     def sticky(_id: String, msg: String): Unit
 
     protected val conn: PubSub[String, String]
-    protected def monitorAndSend(channel: Channel, msg: String) = {
-      val path = msg.takeWhile(' ' !=)
-      lila.mon.ws.out(channel, path).increment()
-      conn.async
-        .publish(channel, msg)
-        .thenApply {
-          new java.util.function.Function[java.lang.Long, Unit] {
-            def apply(clients: java.lang.Long) = lila.mon.ws.outSuccess(channel, path).record(clients).unit
-          }
-        }
-        .unit
-    }
+    protected def send(channel: Channel, msg: String) = conn.async.publish(channel, msg)
   }
 
   object Protocol {

translation/dest/keyboardMove/hy-AM.xml

@@ -10,6 +10,7 @@
   <string name="dropARookAtB4">Նավակը տեղափոխել b4 (Crazyhouse տարբերակում)</string>
   <string name="offerOrAcceptDraw">Առաջարկել կամ ընդունել ոչ-ոքի</string>
   <string name="readOutClocks">Իմանալ ժամացույցի ժամանակը</string>
+  <string name="readOutOpponentName" comment="readOutOpponentName&#10;&#10;Press a button on the keyboard to hear the opponent's name aloud.">Արտաբերել մրցակցի անունը</string>
   <string name="otherCommands">Այլ հրահանգներ</string>
   <string name="tips">Խորհուրդներ</string>
   <string name="ifTheAboveMoveNotationIsUnfamiliar">Եթե վերը թվարկված քայլերն անհասկանալի են, դրանք ուսումնասիրեք այստեղ.</string>

translation/dest/puzzleTheme/vi-VN.xml

@@ -121,4 +121,5 @@
   <string name="zugzwangDescription">Đối phương bị giới hạn các nước mà họ có thể đi và tất cả các nước đi ấy đều hại họ.</string>
   <string name="healthyMix">Một sự kết hợp nhẹ nhàng</string>
   <string name="healthyMixDescription">Mỗi thứ một chút. Bạn không biết phải chờ đợi gì cả, vậy nên bạn sẽ sẵn sàng cho mọi thứ! Như một ván cờ thật vậy.</string>
+  <string name="playerGames">Các ván đấu của những người chơi</string>
 </resources>

ui/analyse/css/study/relay/_tour.scss

@@ -50,8 +50,8 @@
         &:nth-child(3) {
           font-weight: bold;
         }
-        &:nth-child(4) {
-          // width: 2ch;
+        &:last-child {
+          padding-#{$end-direction}: 1.5em;
         }
       }
     }

ui/analyse/src/study/relay/relayTourView.ts

@@ -66,8 +66,8 @@ const leaderboard = (players: LeadPlayer[]): VNode => {
         players.map(player =>
           h('tr', [
             h('th', player.name),
-            h('td', player.rating),
-            withRating ? h('td', player.score) : undefined,
+            withRating ? h('td', player.rating) : undefined,
+            h('td', player.score),
             h('td', player.played),
           ])
         )

ui/puzzle/src/ctrl.ts

@@ -2,11 +2,21 @@ import * as speech from './speech';
 import * as xhr from './xhr';
 import computeAutoShapes from './autoShape';
 import keyboard from './keyboard';
-import { PromotionCtrl } from 'chess/promotion';
 import moveTest from './moveTest';
 import PuzzleSession from './session';
 import PuzzleStreak from './streak';
 import throttle from 'common/throttle';
+import {
+  Redraw,
+  Vm,
+  Controller,
+  PuzzleOpts,
+  PuzzleData,
+  MoveTest,
+  ThemeKey,
+  NvuiPlugin,
+  ReplayEnd,
+} from './interfaces';
 import { Api as CgApi } from 'chessground/api';
 import { build as treeBuild, ops as treeOps, path as treePath, TreeWrapper } from 'tree';
 import { Chess, normalizeMove } from 'chessops/chess';
@@ -20,7 +30,7 @@ import { makeSanAndPlay } from 'chessops/san';
 import { parseFen, makeFen } from 'chessops/fen';
 import { parseSquare, parseUci, makeSquare, makeUci, opposite } from 'chessops/util';
 import { pgnToTree, mergeSolution } from './moveTree';
-import { Redraw, Vm, Controller, PuzzleOpts, PuzzleData, MoveTest, ThemeKey, NvuiPlugin } from './interfaces';
+import { PromotionCtrl } from 'chess/promotion';
 import { Role, Move, Outcome } from 'chessops/types';
 import { storedBooleanProp } from 'common/storage';
 import { fromNodeList } from 'tree/dist/path';
@@ -325,28 +335,30 @@ export default function (opts: PuzzleOpts, redraw: Redraw): Controller {
       if (res.round?.ratingDiff) session.setRatingDiff(data.puzzle.id, res.round.ratingDiff);
     }
     if (win) speech.success();
-    if (res.replayComplete) vm.next.reject('replay complete');
-    else vm.next.resolve(res.next);
+    vm.next.resolve(data.replay && res.replayComplete ? data.replay : res.next);
     if (streak && win) streak.onComplete(true, res.next);
     redraw();
   }
 
+  const isPuzzleData = (d: PuzzleData | ReplayEnd): d is PuzzleData => 'puzzle' in d;
+
   function nextPuzzle(): void {
     if (streak && vm.lastFeedback != 'win') return;
 
     ceval.stop();
-    vm.next.promise.then(initiate).then(redraw).catch(redirectToDashboard);
+    vm.next.promise.then(n => {
+      if (isPuzzleData(n)) {
+        initiate(n);
+        redraw();
+      } else lichess.redirect(`/training/dashboard/${n.days}`);
+    });
 
     if (!streak && !data.replay) {
       const path = `/training/${data.angle.key}`;
       if (location.pathname != path) history.replaceState(null, '', path);
     }
   }
 
-  function redirectToDashboard() {
-    if (data.replay) lichess.redirect(`/training/dashboard/${data.replay.days}`);
-  }
-
   function instanciateCeval(): void {
     if (ceval) ceval.destroy();
     ceval = cevalCtrl({

ui/puzzle/src/interfaces.ts

@@ -88,6 +88,8 @@ export interface NvuiPlugin {
   render(ctrl: Controller): VNode;
 }
 
+export type ReplayEnd = PuzzleReplay;
+
 export interface Vm {
   path: Tree.Path;
   nodeList: Tree.Node[];
@@ -96,7 +98,7 @@ export interface Vm {
   pov: Color;
   mode: 'play' | 'view' | 'try';
   round?: PuzzleRound;
-  next: Deferred<PuzzleData>;
+  next: Deferred<PuzzleData | ReplayEnd>;
   justPlayed?: Key;
   resultSent: boolean;
   lastFeedback: 'init' | 'fail' | 'win' | 'good' | 'retry';