projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Scale Discord and Github icons, slightly better displayed
[vchess.git]
/
server
/
routes
/
games.js
diff --git
a/server/routes/games.js
b/server/routes/games.js
index
607ab39
..
a86a76d
100644
(file)
--- a/
server/routes/games.js
+++ b/
server/routes/games.js
@@
-8,14
+8,15
@@
const params = require("../config/parameters");
// From main hall, start game between players 0 and 1
router.post("/games", access.logged, access.ajax, (req,res) => {
const gameInfo = req.body.gameInfo;
// From main hall, start game between players 0 and 1
router.post("/games", access.logged, access.ajax, (req,res) => {
const gameInfo = req.body.gameInfo;
+ // Challenge ID is provided if game start from Hall:
const cid = req.body.cid;
if (
Array.isArray(gameInfo.players) &&
const cid = req.body.cid;
if (
Array.isArray(gameInfo.players) &&
- gameInfo.players.some(p => p.id == req.userId) &&
-
cid.toString().match(/^[0-9]+$/
) &&
+ gameInfo.players.some(p => p.
u
id == req.userId) &&
+
(!cid || cid.toString().match(/^[0-9]+$/)
) &&
GameModel.checkGameInfo(gameInfo)
) {
GameModel.checkGameInfo(gameInfo)
) {
- ChallengeModel.remove(cid);
+
if (!!cid)
ChallengeModel.remove(cid);
GameModel.create(
gameInfo.vid, gameInfo.fen, gameInfo.cadence, gameInfo.players,
(err,ret) => {
GameModel.create(
gameInfo.vid, gameInfo.fen, gameInfo.cadence, gameInfo.players,
(err,ret) => {
@@
-35,7
+36,7
@@
router.get("/games", access.ajax, (req,res) => {
{
if (gameId.match(/^[0-9]+$/))
{
{
if (gameId.match(/^[0-9]+$/))
{
- GameModel.getOne(gameId,
false,
(err,game) => {
+ GameModel.getOne(gameId, (err,game) => {
res.json({game: game});
});
}
res.json({game: game});
});
}
@@
-57,14
+58,19
@@
router.get("/games", access.ajax, (req,res) => {
// FEN update + score(Msg) + draw status / and new move + chats
router.put("/games", access.logged, access.ajax, (req,res) => {
const gid = req.body.gid;
// FEN update + score(Msg) + draw status / and new move + chats
router.put("/games", access.logged, access.ajax, (req,res) => {
const gid = req.body.gid;
-
cons
t obj = req.body.newObj;
+
le
t obj = req.body.newObj;
if (gid.toString().match(/^[0-9]+$/) && GameModel.checkGameUpdate(obj))
{
GameModel.getPlayers(gid, (err,players) => {
if (gid.toString().match(/^[0-9]+$/) && GameModel.checkGameUpdate(obj))
{
GameModel.getPlayers(gid, (err,players) => {
- if (players.some(p => p.uid == req.userId))
- {
+ const myIdx = players.findIndex(p => p.uid == req.userId)
+ if (myIdx >= 0) {
+ // Did I mark the game for deletion?
+ if (!!obj.removeFlag) {
+ obj.deletedBy = ["w","b"][myIdx];
+ delete obj["removeFlag"];
+ }
GameModel.update(gid, obj, (err) => {
GameModel.update(gid, obj, (err) => {
- if (!err && (
obj.move ||
obj.score))
+ if (!err && (
!!obj.move || !!
obj.score))
{
// Notify opponent if he enabled notifications:
const oppid = players[0].uid == req.userId
{
// Notify opponent if he enabled notifications:
const oppid = players[0].uid == req.userId
@@
-90,8
+96,8
@@
router.delete("/chats", access.logged, access.ajax, (req,res) => {
GameModel.getPlayers(gid, (err,players) => {
if (players.some(p => p.uid == req.userId))
{
GameModel.getPlayers(gid, (err,players) => {
if (players.some(p => p.uid == req.userId))
{
- GameModel.update(gid, {delchat: true}, (
err
) => {
- res.json(
err ||
{});
+ GameModel.update(gid, {delchat: true}, () => {
+ res.json({});
});
}
});
});
}
});