X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fchallenges.js;fp=server%2Froutes%2Fchallenges.js;h=d27f81eeb7db8361e9f17d5fbf7b25c80364513a;hp=680a69fd766311c3feb219b4cca411944673fcb8;hb=0234201fb338fc239d6f613c677fa932c7c3697c;hpb=585d095517ca2aedab8ad125cc7c39b90e13d5cc diff --git a/server/routes/challenges.js b/server/routes/challenges.js index 680a69fd..d27f81ee 100644 --- a/server/routes/challenges.js +++ b/server/routes/challenges.js @@ -5,10 +5,8 @@ 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, randomness: req.body.chall.randomness, @@ -17,17 +15,15 @@ router.post("/challenges", access.logged, access.ajax, (req,res) => { 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) - { + if (req.body.chall.to) { UserModel.getOne("name", challenge.to, (err,user) => { if (err || !user) res.json(err || {errmsg: "Typo in player name"}); - else - { + else { challenge.to = user.id; //ready now to insert challenge insertChallenge(); if (user.notify) @@ -36,26 +32,22 @@ router.post("/challenges", access.logged, access.ajax, (req,res) => { "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({}); }