X-Git-Url: https://git.auder.net/js/rpsls.js?a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=5f332b758db5cd185c2d8407a9f5654a8ac5625f;hb=8be8238cbd8bd1eeeb4c101648d6902cae425f7b;hp=080cab3c69b38ec3f2c5b84f780cd02c03133672;hpb=f14572c4a22425033735253eabbaa2d8dbb53d05;p=vchess.git

diff --git a/server/models/Game.js b/server/models/Game.js
index 080cab3c..5f332b75 100644
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -232,11 +232,18 @@ const GameModel =
         "JOIN Variants v " +
         "  ON g.vid = v.id " +
         "WHERE " +
-        "  score <> '*' AND " +
-        "  created < " + cursor + " AND " +
+        "  score <> '*' AND" +
+        "  created < " + cursor + " AND" +
         "  (" +
-        "    (" + uid + " = white AND NOT deletedByWhite) OR " +
-        "    (" + uid + " = black AND NOT deletedByBlack)" +
+        "    (" +
+        "      white = " + uid + " AND" +
+        "      (deletedByWhite IS NULL OR NOT deletedByWhite)" +
+        "    )" +
+        "    OR " +
+        "    (" +
+        "      black = " + uid + " AND" +
+        "      (deletedByBlack IS NULL OR NOT deletedByBlack)" +
+        "    )" +
         "  ) ";
       query +=
         "ORDER BY created DESC " +
@@ -293,10 +300,7 @@ const GameModel =
     // 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]$/))
       ) && (