X-Git-Url: https://git.auder.net/pieces/Checkered/cp.svg?a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=d57aac8dd6427b12147a3936f8a773ce20868692;hb=633959bf1cf6a8701760748d399b0ae86afddaad;hp=da59b4a6dbe6433e84beeceaa501b13fc12f0f0d;hpb=dac395887d96e2d642b209c6db6aaacc3ffacb34;p=vchess.git

diff --git a/server/models/Game.js b/server/models/Game.js
index da59b4a6..d57aac8d 100644
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -11,7 +11,7 @@ const UserModel = require("./User");
  *   score: varchar (result)
  *   scoreMsg: varchar ("Time", "Mutual agreement"...)
  *   created: datetime
- *   drawOffer: boolean
+ *   drawOffer: char ('w','b' or '' for none)
  *
  * Structure table Players:
  *   gid: ref game id
@@ -56,7 +56,7 @@ const GameModel =
         "INSERT INTO Games"
         + " (vid, fenStart, fen, score, timeControl, created, drawOffer)"
         + " VALUES (" + vid + ",'" + fen + "','" + fen + "','*','"
-        + timeControl + "'," + Date.now() + "," + false + ")";
+        + timeControl + "'," + Date.now() + ",'')";
       db.run(query, function(err) {
         if (!!err)
           return cb(err);
@@ -81,7 +81,7 @@ const GameModel =
         // NOTE: g.scoreMsg can be NULL
         // (in this case score = "*" and no reason to look at it)
         "SELECT g.id, g.vid, g.fen, g.fenStart, g.timeControl, g.score, " +
-          "g.scoreMsg, v.name AS vname " +
+          "g.scoreMsg, g.drawOffer, v.name AS vname " +
         "FROM Games g " +
         "JOIN Variants v " +
         "  ON g.vid = v.id " +
@@ -131,9 +131,8 @@ const GameModel =
   getByUser: function(uid, excluded, cb)
   {
     db.serialize(function() {
-      // Next query is fine because a player appear at most once in a game
       const query =
-        "SELECT gid " +
+        "SELECT DISTINCT gid " +
         "FROM Players " +
         "WHERE uid " + (excluded ? "<>" : "=") + " " + uid;
       db.all(query, (err,gameIds) => {
@@ -179,6 +178,8 @@ const GameModel =
       if (!obj.move.idx.toString().match(/^[0-9]+$/))
         return "Wrong move index";
     }
+    if (!!obj.drawOffer && !obj.drawOffer.match(/^[wbtn]$/))
+      return "Wrong draw offer format";
     if (!!obj.fen && !obj.fen.match(/^[a-zA-Z0-9, /-]*$/))
       return "Wrong FEN string";
     if (!!obj.score && !obj.score.match(/^[012?*\/-]+$/))
@@ -200,8 +201,14 @@ const GameModel =
       let modifs = "";
       if (!!obj.message)
         modifs += "message = message || ' ' || '" + obj.message + "',";
-      if ([true,false].includes(obj.drawOffer))
-        modifs += "drawOffer = " + obj.drawOffer + ",";
+      // NOTE: if drawOffer is set, we should check that it's player's turn
+      // A bit overcomplicated. Let's trust the client on that for now...
+      if (!!obj.drawOffer)
+      {
+        if (obj.drawOffer == "n") //Special "None" update
+          obj.drawOffer = "";
+        modifs += "drawOffer = '" + obj.drawOffer + "',";
+      }
       if (!!obj.fen)
         modifs += "fen = '" + obj.fen + "',";
       if (!!obj.score)