X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=32b2a6624b8fdc9127d9e88d61ead7096787ed49;hb=99f12ac0a1dc9633db08bf2804d7920d060fc214;hp=d57aac8dd6427b12147a3936f8a773ce20868692;hpb=633959bf1cf6a8701760748d399b0ae86afddaad;p=vchess.git

diff --git a/server/models/Game.js b/server/models/Game.js
index d57aac8d..32b2a662 100644
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -138,7 +138,8 @@ const GameModel =
       db.all(query, (err,gameIds) => {
         if (!!err)
           return cb(err);
-        gameIds = gameIds || []; //might be empty
+        if (gameIds.length == 0)
+          return cb(null, []);
         let gameArray = [];
         for (let i=0; i<gameIds.length; i++)
         {
@@ -268,7 +269,7 @@ const GameModel =
     const day = 86400000;
     db.serialize(function() {
       let query =
-        "SELECT id,score " +
+        "SELECT id,score,created " +
         "FROM Games ";
       db.all(query, (err,games) => {
         games.forEach(g => {
@@ -277,13 +278,19 @@ const GameModel =
             "FROM Moves " +
             "WHERE gid = " + g.id;
           db.get(query, (err2,updated) => {
-            if (!updated && tsNow - g.created > 7*day)
-              return GameModel.remove(g.id);
-            const lastMaj = updated.lastMaj;
-            if (g.score != "*" && tsNow - lastMaj > 7*day ||
-              g.score == "*" && tsNow - lastMaj > 91*day)
+            if (!updated.lastMaj)
             {
-              GameModel.remove(g.id);
+              if (tsNow - g.created > 7*day)
+                return GameModel.remove(g.id);
+            }
+            else //at least one move
+            {
+              const lastMaj = updated.lastMaj;
+              if (g.score != "*" && tsNow - lastMaj > 7*day ||
+                g.score == "*" && tsNow - lastMaj > 91*day)
+              {
+                GameModel.remove(g.id);
+              }
             }
           });
         });