projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix corr challenges
[vchess.git]
/
server
/
routes
/
challenges.js
diff --git
a/server/routes/challenges.js
b/server/routes/challenges.js
index
c2e55c8
..
28103fc
100644
(file)
--- a/
server/routes/challenges.js
+++ b/
server/routes/challenges.js
@@
-4,6
+4,7
@@
let router = require("express").Router();
const access = require("../utils/access");
const ChallengeModel = require("../models/Challenge");
const UserModel = require("../models/User"); //for name check
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) => {
ChallengeModel.getByUser(req.query["uid"], (err,challenges) => {
router.get("/challenges", (req,res) => {
ChallengeModel.getByUser(req.query["uid"], (err,challenges) => {
@@
-24,9
+25,8
@@
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) => {
- if (!!err)
- return res.json(err);
+ ChallengeModel.create(challenge, (err,ret) => {
+ return res.json(err || {cid:ret.cid});
});
};
if (!!req.body.chall.to)
});
};
if (!!req.body.chall.to)
@@
-36,6
+36,8
@@
router.post("/challenges", access.logged, access.ajax, (req,res) => {
return res.json(err | {errmsg: "Typo in player name"});
challenge.to = user.id; //ready now to insert challenge
insertChallenge();
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
});
}
else
@@
-44,7
+46,7
@@
router.post("/challenges", access.logged, access.ajax, (req,res) => {
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;
- ChallengeModel.
r
emove(cid, req.userId, err => {
+ ChallengeModel.
safeR
emove(cid, req.userId, err => {
res.json(err || {}); //TODO: just "return err" because is empty if no errors
});
});
res.json(err || {}); //TODO: just "return err" because is empty if no errors
});
});