X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fchallenges.js;fp=server%2Froutes%2Fchallenges.js;h=03fc15003d3599e81145245ee2643e1b89006cfa;hp=1348cf457c282bc5c46bd957f17d707c3441bae5;hb=bf20f404705c622a7bb7e458dacce37ecb7405a9;hpb=5d04793e1bce0d448b4ffc532f1e8eb47a72e972

diff --git a/server/routes/challenges.js b/server/routes/challenges.js
index 1348cf45..03fc1500 100644
--- a/server/routes/challenges.js
+++ b/server/routes/challenges.js
@@ -15,56 +15,37 @@ router.post("/challenges", access.logged, access.ajax, (req,res) => {
   const error = ChallengeModel.checkChallenge(req.body.chall);
   if (!!error)
     return res.json({errmsg:error});
-  const challenge =
+  let challenge =
   {
     fen: req.body.chall.fen,
     timeControl: req.body.chall.timeControl,
     vid: req.body.chall.vid,
     uid: req.userId,
-    nbPlayers: req.body.chall.to.length,
+    to: req.body.chall.to, //string: user name (may be empty)
   };
-  ChallengeModel.create(challenge, (err,lastId) => {
-    if (!!err)
-      return res.json(err);
-    if (!!req.body.chall.to[0])
-    {
-      UserModel.getByName(req.body.chall.to, (err,users) => {
-        if (!!err)
-          return res.json(err);
-        if (users.length < req.body.chall.to.length)
-          return res.json({errmsg: "Typo in player(s) name(s)"});
-        ChallengeModel.initializeWillPlay(
-          users.map(u => u.id),
-          lastId["rowid"],
-          (err) => {
-            if (!!err)
-              return res.json(err);
-            res.json({cid: lastId["rowid"]});
-          }
-        );
-      });
-    }
-    else
-      res.json({cid: lastId["rowid"]});
-  });
-});
-
-// Nothing to do if challenge is refused (just removal)
-router.put("/challenges", access.logged, access.ajax, (req,res) => {
-  // Accept challenge: turn WillPlay to true; if then challenge is full, launch game
-  ChallengeModel.getSeatCount(req.body.id, (scount) => {
-    if (scount == 1)
-      launchGame(req.body.id, req.userId);
-    else
-      ChallengeModel.setSeat(req.body.id, req.userId);
-  });
-  res.json({});
+  const insertChallenge = () => {
+    ChallengeModel.create(challenge, (err) => {
+      if (!!err)
+        return res.json(err);
+    });
+  };
+  if (!!req.body.chall.to)
+  {
+    UserModel.getOne("name", challenge.to, (err,user) => {
+      if (!!err || !user)
+        return res.json(err | {errmsg: "Typo in player name"});
+      challenge.to = user.id; //ready now to insert challenge
+    });
+    insertChallenge();
+  }
+  else
+    insertChallenge();
 });
 
 function launchGame(cid, uid)
 {
-  // TODO: gather challenge infos + WillPlay
-  // Then create game, and remove challenge + WillPlay
+  // TODO: gather challenge infos
+  // Then create game, and remove challenge
 }
 
 //// index