* created: datetime
* drawOffer: char ('w','b' or '' for none)
* rematchOffer: char (similar to drawOffer)
- * randomness: integer
+ * options: varchar
* deletedByWhite: boolean
* deletedByBlack: boolean
* chatReadWhite: datetime
return (
g.vid.toString().match(/^[0-9]+$/) &&
g.cadence.match(/^[0-9dhms +]+$/) &&
- g.randomness.toString().match(/^[0-2]$/) &&
g.fen.match(/^[a-zA-Z0-9, /-]*$/) &&
g.players.length == 2 &&
g.players.every(p => p.id.toString().match(/^[0-9]+$/))
});
},
- create: function(vid, fen, randomness, cadence, players, cb) {
+ create: function(vid, fen, options, cadence, players, cb) {
db.serialize(function() {
let query =
"INSERT INTO Games " +
"(" +
- "vid, fenStart, fen, randomness, " +
+ "vid, fenStart, fen, options, " +
"white, black, " +
"cadence, created" +
") " +
"VALUES " +
"(" +
- vid + ",'" + fen + "','" + fen + "'," + randomness + "," +
+ vid + ",'" + fen + "','" + fen + "',?," +
players[0].id + "," + players[1].id + "," +
"'" + cadence + "'," + Date.now() +
")";
- db.run(query, function(err) {
+ db.run(query, options, function(err) {
cb(err, { id: this.lastID });
});
});
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, options, 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);
});
getObserved: function(uid, cursor, cb) {
db.serialize(function() {
let query =
- "SELECT id, vid, cadence, created, score, white, black " +
+ "SELECT id, vid, cadence, options, created, score, white, black " +
"FROM Games " +
"WHERE created < " + cursor + " ";
if (uid > 0) {
"ORDER BY created DESC " +
"LIMIT 20"; //TODO: 20 hard-coded...
db.all(query, (err, games) => {
+ games = games || [];
// Query players names
let pids = {};
games.forEach(g => {
if (!pids[g.black]) pids[g.black] = true;
});
UserModel.getByIds(Object.keys(pids), (err2, users) => {
+ users = users || [];
let names = {};
users.forEach(u => { names[u.id] = u.name; });
cb(
id: g.id,
vid: g.vid,
cadence: g.cadence,
+ options: g.options,
created: g.created,
score: g.score,
players: [
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, options, created, white, black " +
+ "FROM Games " +
"WHERE score = '*' AND (white = " + uid + " OR black = " + uid + ")";
db.all(query, (err, games) => {
+ games = games || [];
// Get movesCount (could be done in // with next query)
query =
"SELECT gid, COUNT(*) AS nbMoves " +
if (!pids[g.black]) pids[g.black] = true;
});
UserModel.getByIds(Object.keys(pids), (err2, users) => {
+ users = users || [];
let names = {};
users.forEach(u => { names[u.id] = u.name; });
cb(
g => {
return {
id: g.id,
- vname: g.vname,
+ vid: g.vid,
cadence: g.cadence,
+ options: g.options,
created: g.created,
score: g.score,
movesCount: movesCounts[g.id] || 0,
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, options, created, score, scoreMsg, " +
+ "white, black, deletedByWhite, deletedByBlack " +
+ "FROM Games " +
"WHERE " +
" score <> '*' AND" +
" created < " + cursor + " AND" +
"ORDER BY created DESC " +
"LIMIT 20";
db.all(query, (err, games) => {
+ games = games || [];
// Query player names
let pids = {};
games.forEach(g => {
if (!pids[g.black]) pids[g.black] = true;
});
UserModel.getByIds(Object.keys(pids), (err2, users) => {
+ users = users || [];
let names = {};
users.forEach(u => { names[u.id] = u.name; });
cb(
g => {
return {
id: g.id,
- vname: g.vname,
+ vid: g.vid,
cadence: g.cadence,
+ options: g.options,
created: g.created,
score: g.score,
scoreMsg: g.scoreMsg,
) && (
!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 >