X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fchallenges.js;h=a7adcf5cc2c1707679c15eb0b80a826b27695fda;hb=99b7a14c6e01c53a49459c8d4681acf6abe635d8;hp=40c50ec8b6186edc64174e3c6ccf4a9ebe694a87;hpb=77fd729819118d491ff91c1d99960add2ef9cff3;p=vchess.git

diff --git a/server/routes/challenges.js b/server/routes/challenges.js
index 40c50ec8..a7adcf5c 100644
--- a/server/routes/challenges.js
+++ b/server/routes/challenges.js
@@ -4,70 +4,54 @@ let router = require("express").Router();
 const access = require("../utils/access");
 const ChallengeModel = require("../models/Challenge");
 const UserModel = require("../models/User"); //for name check
+const params = require("../config/parameters");
+
+router.get("/challenges", (req,res) => {
+  if (!req.query["uid"].match(/^[0-9]+$/))
+    res.json({errmsg: "Bad user ID"});
+  ChallengeModel.getByUser(req.query["uid"], (err,challenges) => {
+    res.json(err || {challenges:challenges});
+  });
+});
 
 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"]});
-  });
+  const insertChallenge = () => {
+    ChallengeModel.create(challenge, (err,ret) => {
+      return res.json(err || {cid:ret.cid});
+    });
+  };
+  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();
+      if (user.notify)
+        UserModel.notify(user, "New challenge: " + params.siteURL + "/");
+    });
+  }
+  else
+    insertChallenge();
 });
 
-//// index
-//router.get("/challenges", access.logged, access.ajax, (req,res) => {
-//  if (req.query["uid"] != req.user._id)
-//    return res.json({errmsg: "Not your challenges"});
-//  let uid = ObjectID(req.query["uid"]);
-//  ChallengeModel.getByPlayer(uid, (err, challengeArray) => {
-//    res.json(err || {challenges: challengeArray});
-//  });
-//});
-//
-//function createChallenge(vid, from, to, res)
-//{
-//  ChallengeModel.create(vid, from, to, (err, chall) => {
-//    res.json(err || {
-//      // A challenge can be sent using only name, thus 'to' is returned
-//      to: chall.to,
-//      cid: chall._id
-//    });
-//  });
-//}
-
 router.delete("/challenges", access.logged, access.ajax, (req,res) => {
   const cid = req.query.id;
-  ChallengeModel.remove(cid, req.userId, err => {
-    res.json(err || {});
+  if (!cid.match(/^[0-9]+$/))
+    res.json({errmsg: "Bad challenge ID"});
+  ChallengeModel.safeRemove(cid, req.userId, err => {
+    res.json(err || {}); //TODO: just "return err" because is empty if no errors
   });
 });