X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fgames.js;h=a86a76ddedce9301a40c44232774252373f45356;hp=c8de00dc0eaff17e185a0b93c4e55cdbf6f10cd1;hb=584f81b93154313a3856112400b7df98e0eb2632;hpb=bc50b249eb255c2f55988be4b8d7b27addd72577

diff --git a/server/routes/games.js b/server/routes/games.js
index c8de00dc..a86a76dd 100644
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -8,14 +8,15 @@ const params = require("../config/parameters");
 // From main hall, start game between players 0 and 1
 router.post("/games", access.logged, access.ajax, (req,res) => {
   const gameInfo = req.body.gameInfo;
+  // Challenge ID is provided if game start from Hall:
   const cid = req.body.cid;
   if (
     Array.isArray(gameInfo.players) &&
-    gameInfo.players.some(p => p.id == req.userId) &&
-    cid.toString().match(/^[0-9]+$/) &&
+    gameInfo.players.some(p => p.uid == req.userId) &&
+    (!cid || cid.toString().match(/^[0-9]+$/)) &&
     GameModel.checkGameInfo(gameInfo)
   ) {
-    ChallengeModel.remove(cid);
+    if (!!cid) ChallengeModel.remove(cid);
     GameModel.create(
       gameInfo.vid, gameInfo.fen, gameInfo.cadence, gameInfo.players,
       (err,ret) => {
@@ -35,7 +36,7 @@ router.get("/games", access.ajax, (req,res) => {
   {
     if (gameId.match(/^[0-9]+$/))
     {
-      GameModel.getOne(gameId, false, (err,game) => {
+      GameModel.getOne(gameId, (err,game) => {
         res.json({game: game});
       });
     }
@@ -54,32 +55,52 @@ router.get("/games", access.ajax, (req,res) => {
   }
 });
 
-// New move + fen update + score + chats...
+// FEN update + score(Msg) + draw status / and new move + chats
 router.put("/games", access.logged, access.ajax, (req,res) => {
   const gid = req.body.gid;
-  const obj = req.body.newObj;
+  let obj = req.body.newObj;
   if (gid.toString().match(/^[0-9]+$/) && GameModel.checkGameUpdate(obj))
   {
     GameModel.getPlayers(gid, (err,players) => {
-      if (players.some(p => p.uid == req.userId))
-      {
-        GameModel.update(gid, obj);
-        if (obj.move || obj.score)
-        {
-          // Notify opponent if he enabled notifications:
-          const oppid = players[0].uid == req.userId
-            ? players[1].uid
-            : players[0].uid;
-          const messagePrefix = obj.move
-            ? "New move in game: "
-            : "Game ended: ";
-          UserModel.tryNotify(oppid,
-            messagePrefix + params.siteURL + "/#/game/" + gid);
+      const myIdx = players.findIndex(p => p.uid == req.userId)
+      if (myIdx >= 0) {
+        // Did I mark the game for deletion?
+        if (!!obj.removeFlag) {
+          obj.deletedBy = ["w","b"][myIdx];
+          delete obj["removeFlag"];
         }
-        res.json({});
+        GameModel.update(gid, obj, (err) => {
+          if (!err && (!!obj.move || !!obj.score))
+          {
+            // Notify opponent if he enabled notifications:
+            const oppid = players[0].uid == req.userId
+              ? players[1].uid
+              : players[0].uid;
+            const messagePrefix = obj.move
+              ? "New move in game: "
+              : "Game ended: ";
+            UserModel.tryNotify(oppid,
+              messagePrefix + params.siteURL + "/#/game/" + gid);
+          }
+          res.json(err || {});
+        });
       }
     });
   }
 });
 
+// TODO: chats deletion here, but could/should be elsewhere.
+// Moves update also could, although logical unit in a game.
+router.delete("/chats", access.logged, access.ajax, (req,res) => {
+  const gid = req.query["gid"];
+  GameModel.getPlayers(gid, (err,players) => {
+    if (players.some(p => p.uid == req.userId))
+    {
+      GameModel.update(gid, {delchat: true}, () => {
+        res.json({});
+      });
+    }
+  });
+});
+
 module.exports = router;