db.serialize(function() {
let query =
"SELECT " +
- "g.id, g.fen, g.fenStart, g.cadence, g.created, " +
- "g.white, g.black, g.randomness, g.score, g.scoreMsg, " +
- "g.chatReadWhite, g.chatReadBlack, g.drawOffer, " +
- // TODO: vid and vname are redundant
- "g.rematchOffer, v.id as vid, v.name AS vname " +
- "FROM Games g " +
- "JOIN Variants v " +
- " ON g.vid = v.id " +
- "WHERE g.id = " + id;
+ "id, vid, fen, fenStart, cadence, created, " +
+ "white, black, randomness, score, scoreMsg, " +
+ "chatReadWhite, chatReadBlack, drawOffer, rematchOffer " +
+ "FROM Games " +
+ "WHERE id = " + id;
db.get(query, (err, gameInfo) => {
if (!gameInfo) {
cb(err || { errmsg: "Game not found" }, undefined);
"WHERE gid = " + id;
db.all(query, (err4, chats) => {
const game = Object.assign(
- {},
- gameInfo,
{
players: players,
moves: moves,
chats: chats
- }
+ },
+ gameInfo
);
cb(null, game);
});
getRunning: function(uid, cb) {
db.serialize(function() {
let query =
- "SELECT g.id, g.cadence, g.created, " +
- "g.white, g.black, v.name AS vname " +
- "FROM Games g " +
- "JOIN Variants v " +
- " ON g.vid = v.id " +
+ "SELECT id, vid, cadence, created, white, black " +
+ "FROM Games " +
"WHERE score = '*' AND (white = " + uid + " OR black = " + uid + ")";
db.all(query, (err, games) => {
// Get movesCount (could be done in // with next query)
getCompleted: function(uid, cursor, cb) {
db.serialize(function() {
let query =
- "SELECT g.id, g.cadence, g.created, g.score, g.scoreMsg, " +
- "g.white, g.black, g.deletedByWhite, g.deletedByBlack, " +
- "v.name AS vname " +
- "FROM Games g " +
- "JOIN Variants v " +
- " ON g.vid = v.id " +
+ "SELECT id, vid, cadence, created, score, scoreMsg, " +
+ "white, black, deletedByWhite, deletedByBlack " +
+ "FROM Games " +
"WHERE " +
" score <> '*' AND" +
" created < " + cursor + " AND" +
g => {
return {
id: g.id,
- vname: g.vname,
+ vid: g.vid,
cadence: g.cadence,
created: g.created,
score: g.score,
) && (
!obj.rematchOffer || !!(obj.rematchOffer.match(/^[wbn]$/))
) && (
- // TODO: check if commas are still used (probably not)
- !obj.fen || !!(obj.fen.match(/^[a-zA-Z0-9,. /-]*$/))
+ !obj.fen || !!(obj.fen.match(/^[a-zA-Z0-9,.:{}\[\]" /-]*$/))
) && (
!obj.score || !!(obj.score.match(/^[012?*\/-]+$/))
) && (
}
// Set score if lost on time and >= 2 moves:
else if (
+ g.score == '*' &&
!!movesGroups[g.id] &&
movesGroups[g.id].nbMoves >= 2 &&
tsNow - movesGroups[g.id].lastMaj >