Merge branch 'master' into relaychart

lichess-org · Jun 20, 2024 · 8a5d42e · 8a5d42e
2 parents f745e50 + 53a1638
commit 8a5d42e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/modules/security/src/main/EmailChange.scala b/modules/security/src/main/EmailChange.scala
@@ -55,7 +55,7 @@ ${trans.common_orPaste.txt()}
  _ <- userRepo.setEmail(userId, email).recoverDefault
  me <- userRepo.me(userId)
  yield
- logger.info(s"Set email for $id: $email")
+ logger.info(s"Change email for $userId: $previous -> $email")
  me.map(_ -> previous)
  }
 

diff --git a/ui/puzzle/src/autoShape.ts b/ui/puzzle/src/autoShape.ts
@@ -7,6 +7,7 @@ import { NormalMove } from 'chessops/types';
 
 interface Opts {
  node: Tree.Node;
+ nodeList: Tree.Node[];
  showComputer(): boolean;
  ceval: CevalCtrl;
  ground: CgApi;
@@ -71,15 +72,20 @@ export default function (opts: Opts): DrawShape[] {
  });
  } else shapes = shapes.concat(makeAutoShapesFromUci(opposite(color), n.threat.pvs[0].moves[0], 'red'));
  }
+ const feedback = feedbackAnnotation(n, opts.nodeList[opts.nodeList.length - 2]);
+ return shapes.concat(annotationShapes(n)).concat(feedback ? annotationShapes(feedback) : []);
+}
+
+function feedbackAnnotation(n: Tree.Node, prev?: Tree.Node): Tree.Node | undefined {
  let glyph: Tree.Glyph | undefined;
- switch (n.puzzle) {
+ const node = n.puzzle ? n : prev?.puzzle ? prev : undefined;
+ switch (node?.puzzle) {
  case 'good':
  case 'win':
  glyph = { id: 7, name: 'good', symbol: '✓' };
  break;
  case 'fail':
  glyph = { id: 4, name: 'fail', symbol: '✗' };
  }
- const withPuzzleGlyphs = glyph ? { ...n, glyphs: [glyph] } : n;
- return shapes.concat(annotationShapes(withPuzzleGlyphs));
+ return node && glyph && { ...node, glyphs: [glyph] };
 }
diff --git a/ui/puzzle/src/ctrl.ts b/ui/puzzle/src/ctrl.ts
@@ -321,6 +321,7 @@ export default class PuzzleCtrl implements ParentCtrl {
  this.withGround(g => g.playPremove());
 
  const progress = moveTest(this);
+ this.setAutoShapes();
  if (progress === 'fail') site.sound.say('incorrect');
  if (progress) this.applyProgress(progress);
  this.reorderChildren(path);
@@ -349,7 +350,7 @@ export default class PuzzleCtrl implements ParentCtrl {
 
  revertUserMove = (): void => {
  if (site.blindMode) this.instantRevertUserMove();
- else setTimeout(this.instantRevertUserMove, 100);
+ else setTimeout(this.instantRevertUserMove, 300);
  };
 
  applyProgress = (progress: undefined | 'fail' | 'win' | MoveTest): void => {