X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fchallenges.js;h=1f626f203ffd6a4d2e204a81f224d26add839828;hp=efc697011d408340ce05d32103b4e8f9512cbfea;hb=eb2d61de8d569470fa329a484efe9bab420b2b82;hpb=866842c3c310524c034922870234120ed2a16cbf

diff --git a/server/routes/challenges.js b/server/routes/challenges.js
index efc69701..1f626f20 100644
--- a/server/routes/challenges.js
+++ b/server/routes/challenges.js
@@ -5,56 +5,54 @@ const UserModel = require("../models/User"); //for name check
 const params = require("../config/parameters");
 
 router.post("/challenges", access.logged, access.ajax, (req,res) => {
-  if (ChallengeModel.checkChallenge(req.body.chall))
-  {
-    let challenge =
-    {
+  if (ChallengeModel.checkChallenge(req.body.chall)) {
+    let challenge = {
       fen: req.body.chall.fen,
       cadence: req.body.chall.cadence,
+      options: req.body.chall.options,
+      randomness: req.body.chall.randomness,
       vid: req.body.chall.vid,
       uid: req.userId,
       to: req.body.chall.to, //string: user name (may be empty)
     };
     const insertChallenge = () => {
-      ChallengeModel.create(challenge, (err,ret) => {
-        res.json(err || {cid:ret.cid});
+      ChallengeModel.create(challenge, (err, ret) => {
+        res.json(err || ret);
       });
     };
-    if (req.body.chall.to)
-    {
-      UserModel.getOne("name", challenge.to, (err,user) => {
-        if (!!err || !user)
-          res.json(err || {errmsg: "Typo in player name"});
-        else
-        {
-          challenge.to = user.id; //ready now to insert challenge
-          insertChallenge();
-          if (user.notify)
-            UserModel.notify(
-              user,
-              "New challenge: " + params.siteURL + "/#/?disp=corr");
+    if (req.body.chall.to) {
+      UserModel.getOne(
+        "name", challenge.to, "id, name, email, notify",
+        (err, user) => {
+          if (err || !user) res.json(err || {errmsg: "Typo in player name"});
+          else {
+            challenge.to = user.id; //ready now to insert challenge
+            insertChallenge();
+            if (user.notify) {
+              UserModel.notify(
+                user,
+                "New challenge : " + params.siteURL + "/#/?disp=corr");
+            }
+          }
         }
-      });
+      );
     }
-    else
-      insertChallenge();
+    else insertChallenge();
   }
 });
 
 router.get("/challenges", access.ajax, (req,res) => {
   const uid = req.query.uid;
-  if (uid.match(/^[0-9]+$/))
-  {
+  if (uid.match(/^[0-9]+$/)) {
     ChallengeModel.getByUser(uid, (err,challenges) => {
-      res.json(err || {challenges:challenges});
+      res.json(err || { challenges: challenges });
     });
   }
 });
 
 router.delete("/challenges", access.logged, access.ajax, (req,res) => {
   const cid = req.query.id;
-  if (cid.match(/^[0-9]+$/))
-  {
+  if (cid.match(/^[0-9]+$/)) {
     ChallengeModel.safeRemove(cid, req.userId);
     res.json({});
   }