projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Experimental simplification in Game.vue (next step: check move validity when receiving)
[vchess.git]
/
server
/
models
/
Game.js
diff --git
a/server/models/Game.js
b/server/models/Game.js
index
0847c81
..
f05d2fe
100644
(file)
--- a/
server/models/Game.js
+++ b/
server/models/Game.js
@@
-144,6
+144,7
@@
const GameModel = {
"ORDER BY created DESC " +
"LIMIT 20"; //TODO: 20 hard-coded...
db.all(query, (err, games) => {
"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 => {
// Query players names
let pids = {};
games.forEach(g => {
@@
-151,6
+152,7
@@
const GameModel = {
if (!pids[g.black]) pids[g.black] = true;
});
UserModel.getByIds(Object.keys(pids), (err2, users) => {
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(
let names = {};
users.forEach(u => { names[u.id] = u.name; });
cb(
@@
-185,6
+187,7
@@
const GameModel = {
"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) => {
+ games = games || [];
// Get movesCount (could be done in // with next query)
query =
"SELECT gid, COUNT(*) AS nbMoves " +
// Get movesCount (could be done in // with next query)
query =
"SELECT gid, COUNT(*) AS nbMoves " +
@@
-201,6
+204,7
@@
const GameModel = {
if (!pids[g.black]) pids[g.black] = true;
});
UserModel.getByIds(Object.keys(pids), (err2, users) => {
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(
let names = {};
users.forEach(u => { names[u.id] = u.name; });
cb(
@@
-254,6
+258,7
@@
const GameModel = {
"ORDER BY created DESC " +
"LIMIT 20";
db.all(query, (err, games) => {
"ORDER BY created DESC " +
"LIMIT 20";
db.all(query, (err, games) => {
+ games = games || [];
// Query player names
let pids = {};
games.forEach(g => {
// Query player names
let pids = {};
games.forEach(g => {
@@
-261,6
+266,7
@@
const GameModel = {
if (!pids[g.black]) pids[g.black] = true;
});
UserModel.getByIds(Object.keys(pids), (err2, users) => {
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(
let names = {};
users.forEach(u => { names[u.id] = u.name; });
cb(