X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fdata%2FchallengeCheck.js;h=7665f6f48bdbec22472b11fa79196cf3b38c554f;hb=165530a519288327f3a6364a43f1b9e73d944a20;hp=c2700008370f5fbb6014782acc09e8f6633f2962;hpb=bebcc8d45532e67902175f69084a08040f06855f;p=vchess.git

diff --git a/client/src/data/challengeCheck.js b/client/src/data/challengeCheck.js
index c2700008..7665f6f4 100644
--- a/client/src/data/challengeCheck.js
+++ b/client/src/data/challengeCheck.js
@@ -1,29 +1,23 @@
 import { extractTime } from "@/utils/timeControl";
 
-export function checkChallenge(c)
-{
-	const vid = parseInt(c.vid);
-	if (isNaN(vid) || vid <= 0)
-		return "Please select a variant";
+export function checkChallenge(c) {
+  const vid = parseInt(c.vid, 10);
+  if (isNaN(vid) || vid <= 0) return "Please select a variant";
 
-  const tc = extractTime(c.timeControl);
-  if (!tc)
-    return "Wrong time control";
+  const tc = extractTime(c.cadence);
+  if (!tc) return "Wrong time control";
 
-	// Basic alphanumeric check for opponent name
-	if (!!c.to)
-	{
-     // TODO: slightly redundant (see data/userCheck.js)
-		if (!c.to.match(/^[\w]+$/))
-			return "Wrong characters in opponent name";
-	}
+  // Basic alphanumeric check for opponent name
+  if (c.to) {
+    // NOTE: slightly redundant (see data/userCheck.js)
+    if (!c.to.match(/^[\w]+$/)) return "Name: alphanumerics and underscore";
+  }
 
   // Allow custom FEN (and check it) only for individual challenges
-  if (c.fen.length > 0 && !!c.to)
-  {
-    if (!V.IsGoodFen(c.fen))
-      return "Bad FEN string";
+  if (c.fen.length > 0 && !!c.to) {
+    if (!V.IsGoodFen(c.fen)) return "Errors in FEN";
   }
-  else
-    c.fen = "";
+  else c.fen = "";
+
+  return "";
 }