projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo
[vchess.git]
/
server
/
models
/
Game.js
diff --git
a/server/models/Game.js
b/server/models/Game.js
index
5304693
..
0847c81
100644
(file)
--- a/
server/models/Game.js
+++ b/
server/models/Game.js
@@
-15,7
+15,7
@@
const UserModel = require("./User");
* created: datetime
* drawOffer: char ('w','b' or '' for none)
* rematchOffer: char (similar to drawOffer)
* created: datetime
* drawOffer: char ('w','b' or '' for none)
* rematchOffer: char (similar to drawOffer)
- *
randomness: intege
r
+ *
options: varcha
r
* deletedByWhite: boolean
* deletedByBlack: boolean
* chatReadWhite: datetime
* deletedByWhite: boolean
* deletedByBlack: boolean
* chatReadWhite: datetime
@@
-40,7
+40,6
@@
const GameModel = {
return (
g.vid.toString().match(/^[0-9]+$/) &&
g.cadence.match(/^[0-9dhms +]+$/) &&
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]+$/))
g.fen.match(/^[a-zA-Z0-9, /-]*$/) &&
g.players.length == 2 &&
g.players.every(p => p.id.toString().match(/^[0-9]+$/))
@@
-57,22
+56,22
@@
const GameModel = {
});
},
});
},
- create: function(vid, fen,
randomnes
s, cadence, players, cb) {
+ create: function(vid, fen,
option
s, cadence, players, cb) {
db.serialize(function() {
let query =
"INSERT INTO Games " +
"(" +
db.serialize(function() {
let query =
"INSERT INTO Games " +
"(" +
- "vid, fenStart, fen,
randomnes
s, " +
+ "vid, fenStart, fen,
option
s, " +
"white, black, " +
"cadence, created" +
") " +
"VALUES " +
"(" +
"white, black, " +
"cadence, created" +
") " +
"VALUES " +
"(" +
- vid + ",'" + fen + "','" + fen + "',
" + randomness + "
," +
+ vid + ",'" + fen + "','" + fen + "',
?
," +
players[0].id + "," + players[1].id + "," +
"'" + cadence + "'," + Date.now() +
")";
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 });
});
});
cb(err, { id: this.lastID });
});
});
@@
-85,7
+84,7
@@
const GameModel = {
let query =
"SELECT " +
"id, vid, fen, fenStart, cadence, created, " +
let query =
"SELECT " +
"id, vid, fen, fenStart, cadence, created, " +
- "white, black,
randomnes
s, score, scoreMsg, " +
+ "white, black,
option
s, score, scoreMsg, " +
"chatReadWhite, chatReadBlack, drawOffer, rematchOffer " +
"FROM Games " +
"WHERE id = " + id;
"chatReadWhite, chatReadBlack, drawOffer, rematchOffer " +
"FROM Games " +
"WHERE id = " + id;
@@
-133,7
+132,7
@@
const GameModel = {
getObserved: function(uid, cursor, cb) {
db.serialize(function() {
let query =
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) {
"FROM Games " +
"WHERE created < " + cursor + " ";
if (uid > 0) {
@@
-162,6
+161,7
@@
const GameModel = {
id: g.id,
vid: g.vid,
cadence: g.cadence,
id: g.id,
vid: g.vid,
cadence: g.cadence,
+ options: g.options,
created: g.created,
score: g.score,
players: [
created: g.created,
score: g.score,
players: [
@@
-181,7
+181,7
@@
const GameModel = {
getRunning: function(uid, cb) {
db.serialize(function() {
let query =
getRunning: function(uid, cb) {
db.serialize(function() {
let query =
- "SELECT id, vid, cadence, created, white, black " +
+ "SELECT id, vid, cadence,
options,
created, white, black " +
"FROM Games " +
"WHERE score = '*' AND (white = " + uid + " OR black = " + uid + ")";
db.all(query, (err, games) => {
"FROM Games " +
"WHERE score = '*' AND (white = " + uid + " OR black = " + uid + ")";
db.all(query, (err, games) => {
@@
-211,6
+211,7
@@
const GameModel = {
id: g.id,
vid: g.vid,
cadence: g.cadence,
id: g.id,
vid: g.vid,
cadence: g.cadence,
+ options: g.options,
created: g.created,
score: g.score,
movesCount: movesCounts[g.id] || 0,
created: g.created,
score: g.score,
movesCount: movesCounts[g.id] || 0,
@@
-232,7
+233,7
@@
const GameModel = {
getCompleted: function(uid, cursor, cb) {
db.serialize(function() {
let query =
getCompleted: function(uid, cursor, cb) {
db.serialize(function() {
let query =
- "SELECT id, vid, cadence, created, score, scoreMsg, " +
+ "SELECT id, vid, cadence,
options,
created, score, scoreMsg, " +
"white, black, deletedByWhite, deletedByBlack " +
"FROM Games " +
"WHERE " +
"white, black, deletedByWhite, deletedByBlack " +
"FROM Games " +
"WHERE " +
@@
-270,6
+271,7
@@
const GameModel = {
id: g.id,
vid: g.vid,
cadence: g.cadence,
id: g.id,
vid: g.vid,
cadence: g.cadence,
+ options: g.options,
created: g.created,
score: g.score,
scoreMsg: g.scoreMsg,
created: g.created,
score: g.score,
scoreMsg: g.scoreMsg,