projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Rampage Chess
[vchess.git]
/
server
/
routes
/
challenges.js
diff --git
a/server/routes/challenges.js
b/server/routes/challenges.js
index
aee6fd2
..
4c2d5b4
100644
(file)
--- 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) => {
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,
fen: req.body.chall.fen,
cadence: req.body.chall.cadence,
randomness: req.body.chall.randomness,
@@
-17,45
+15,39
@@
router.post("/challenges", access.logged, access.ajax, (req,res) => {
to: req.body.chall.to, //string: user name (may be empty)
};
const insertChallenge = () => {
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) => {
UserModel.getOne("name", challenge.to, (err,user) => {
- if (
!!
err || !user)
+ if (err || !user)
res.json(err || {errmsg: "Typo in player name"});
res.json(err || {errmsg: "Typo in player name"});
- else
- {
+ else {
challenge.to = user.id; //ready now to insert challenge
insertChallenge();
if (user.notify)
UserModel.notify(
user,
challenge.to = user.id; //ready now to insert challenge
insertChallenge();
if (user.notify)
UserModel.notify(
user,
- "New challenge: " + params.siteURL + "/#/?disp=corr");
+ "New challenge
: " + params.siteURL + "/#/?disp=corr");
}
});
}
});
- }
- else
- insertChallenge();
+ } else insertChallenge();
}
});
router.get("/challenges", access.ajax, (req,res) => {
const uid = req.query.uid;
}
});
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) => {
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;
});
}
});
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({});
}
ChallengeModel.safeRemove(cid, req.userId);
res.json({});
}