Several small improvements + integrate options + first working draft of Cwda

[vchess.git] / client / src / data / challengeCheck.js

diff --git a/client/src/data/challengeCheck.js b/client/src/data/challengeCheck.js
index c270000..554dfdf 100644 (file)
--- a/client/src/data/challengeCheck.js
+++ b/client/src/data/challengeCheck.js
@@ -1,29 +1,25 @@
 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 = "";
+
+  if (!V.IsValidOptions(c.options)) return "Invalid options";
+
+  return "";
 }