Merge branch 'master' of github.com:lichess-org/lila

lichess-org · Nov 17, 2024 · dac363a · dac363a
2 parents 3051128 + 64904c1
commit dac363a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/modules/core/src/main/userId.scala b/modules/core/src/main/userId.scala
@@ -74,8 +74,8 @@ object userId:
     given Conversion[Option[UserName], Option[UserStr]] = _.map(_.value)
     given Conversion[UserId, UserStr]                   = _.value
     def read(str: String): Option[UserStr] =
-      val clean = str.trim.takeWhile(' ' !=)
-      Option.when(UserName.historicalRegex.matches(clean))(UserStr(clean))
+      val trimmed = str.trim
+      Option.when(UserName.historicalRegex.matches(trimmed))(UserStr(trimmed))
 
   // the prefix, or entirety, of a user name.
   // "chess-" is a valid username prefix, but not a valid username

diff --git a/modules/web/src/main/ui/help.scala b/modules/web/src/main/ui/help.scala
@@ -245,7 +245,7 @@ object help:
               row(voice("blindfold"), "Toggle blindfold mode"),
               row(voice("clock"), "Read out clocks"),
               row(voice("pieces"), "Read out pieces"),
-              row(voice("white pieces"), "Read out white pieces"),
+              row(voice("white-pieces"), "Read out white pieces"),
               row(voice("next"), trans.puzzle.nextPuzzle()),
               row(voice("upvote"), trans.puzzle.upVote()),
               row(voice("solve"), showPuzzleSolution()),

diff --git a/ui/voice/src/voice.ts b/ui/voice/src/voice.ts
@@ -34,6 +34,7 @@ export function makeVoice(opts: {
   tpe: 'move' | 'coords';
 }): VoiceCtrl {
   let keyupTimeout: number;
+  let shiftDown = false;
   const mic = new Mic();
   const enabled = storedBooleanProp('voice.on', false);
   const showHelp = propWithEffect<boolean | 'list'>(false, opts.redraw);
@@ -57,15 +58,19 @@ export function makeVoice(opts: {
   mic.setLang(lang());
 
   document.addEventListener('keydown', (e: KeyboardEvent) => {
-    if (e.key !== 'Shift') return;
+    if (e.key !== 'Shift' || shiftDown) return;
     const start = mic.isListening || pushTalk();
+    shiftDown = true;
     mic.stop();
     window.speechSynthesis.cancel();
     if (start) mic.start();
     clearTimeout(keyupTimeout);
   });
+
   document.addEventListener('keyup', (e: KeyboardEvent) => {
-    if (e.key !== 'Shift' || !pushTalk()) return;
+    if (e.key !== 'Shift') return;
+    shiftDown = false;
+    if (!pushTalk()) return;
     clearTimeout(keyupTimeout);
     keyupTimeout = setTimeout(() => mic.stop(), 600);
   });