projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix duplicated moves in Cylinder and Circular chess
[vchess.git]
/
server
/
models
/
Game.js
diff --git
a/server/models/Game.js
b/server/models/Game.js
index
641c0dc
..
8511972
100644
(file)
--- a/
server/models/Game.js
+++ b/
server/models/Game.js
@@
-300,10
+300,7
@@
const GameModel =
// Check all that is possible (required) in obj:
return (
(
// Check all that is possible (required) in obj:
return (
(
- !obj.move || (
- !!(obj.move.played.toString().match(/^[0-9]+$/)) &&
- !!(obj.move.idx.toString().match(/^[0-9]+$/))
- )
+ !obj.move || !!(obj.move.idx.toString().match(/^[0-9]+$/))
) && (
!obj.drawOffer || !!(obj.drawOffer.match(/^[wbtn]$/))
) && (
) && (
!obj.drawOffer || !!(obj.drawOffer.match(/^[wbtn]$/))
) && (
@@
-457,7
+454,7
@@
const GameModel =
"SELECT gid, count(*) AS nbMoves, MAX(played) AS lastMaj " +
"FROM Moves " +
"GROUP BY gid";
"SELECT gid, count(*) AS nbMoves, MAX(played) AS lastMaj " +
"FROM Moves " +
"GROUP BY gid";
- db.
get
(query, (err2, mstats) => {
+ db.
all
(query, (err2, mstats) => {
// Reorganize moves data to avoid too many array lookups:
let movesGroups = {};
mstats.forEach(ms => {
// Reorganize moves data to avoid too many array lookups:
let movesGroups = {};
mstats.forEach(ms => {
@@
-467,18
+464,18
@@
const GameModel =
};
});
// Remove games still not really started,
};
});
// Remove games still not really started,
- // with no action in the last
3 month
s:
+ // with no action in the last
2 week
s:
let toRemove = [];
games.forEach(g => {
if (
(
!movesGroups[g.id] &&
let toRemove = [];
games.forEach(g => {
if (
(
!movesGroups[g.id] &&
- tsNow - g.created >
91
*day
+ tsNow - g.created >
14
*day
)
||
(
movesGroups[g.id].nbMoves == 1 &&
)
||
(
movesGroups[g.id].nbMoves == 1 &&
- tsNow - movesGroups[g.id].lastMaj >
91
*day
+ tsNow - movesGroups[g.id].lastMaj >
14
*day
)
) {
toRemove.push(g.id);
)
) {
toRemove.push(g.id);