projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continue debug attempt for move update on server
[vchess.git]
/
server
/
models
/
Game.js
diff --git
a/server/models/Game.js
b/server/models/Game.js
index
3fde91f
..
3945917
100644
(file)
--- a/
server/models/Game.js
+++ b/
server/models/Game.js
@@
-197,17
+197,17
@@
const GameModel =
return (
(
!obj.move || (
return (
(
!obj.move || (
-
obj.move.played.toString().match(/^[0-9]+$/
) &&
-
obj.move.idx.toString().match(/^[0-9]+$/
)
+
!!(obj.move.played.toString().match(/^[0-9]+$/)
) &&
+
!!(obj.move.idx.toString().match(/^[0-9]+$/)
)
)
) && (
)
) && (
- !obj.drawOffer ||
obj.drawOffer.match(/^[wbtn]$/
)
+ !obj.drawOffer ||
!!(obj.drawOffer.match(/^[wbtn]$/)
)
) && (
) && (
- !obj.fen ||
obj.fen.match(/^[a-zA-Z0-9, /-]*$/
)
+ !obj.fen ||
!!(obj.fen.match(/^[a-zA-Z0-9, /-]*$/)
)
) && (
) && (
- !obj.score ||
obj.score.match(/^[012?*\/-]+$/
)
+ !obj.score ||
!!(obj.score.match(/^[012?*\/-]+$/)
)
) && (
) && (
- !obj.scoreMsg ||
obj.scoreMsg.match(/^[a-zA-Z ]+$/
)
+ !obj.scoreMsg ||
!!(obj.scoreMsg.match(/^[a-zA-Z ]+$/)
)
) && (
!obj.chat || UserModel.checkNameEmail({name: obj.chat.name})
)
) && (
!obj.chat || UserModel.checkNameEmail({name: obj.chat.name})
)
@@
-242,7
+242,8
@@
const GameModel =
query += modifs + " WHERE id = " + id;
db.run(query);
}
query += modifs + " WHERE id = " + id;
db.run(query);
}
- if (obj.move)
+ // NOTE: move, chat and delchat are mutually exclusive
+ if (!!obj.move)
{
// Security: only update moves if index is right
query =
{
// Security: only update moves if index is right
query =
@@
-275,7
+276,7
@@
const GameModel =
"DELETE " +
"FROM Chats " +
"WHERE gid = " + id;
"DELETE " +
"FROM Chats " +
"WHERE gid = " + id;
- db.run(query
, cb
);
+ db.run(query);
}
});
},
}
});
},