X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fgames.js;h=9bd9a30bcdb6e50f23f2a682d408336a6589fe2e;hb=92b82defacccf9c4d3755924a71fcb584002ccc6;hp=d1f233bd8fc517ca6afd525cf9a891d2189311a3;hpb=a9b131f10ee55bd96c60180c55666df4b1f4dc4d;p=vchess.git

diff --git a/server/routes/games.js b/server/routes/games.js
index d1f233bd..9bd9a30b 100644
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -1,40 +1,28 @@
 var router = require("express").Router();
 var UserModel = require("../models/User");
-var sendEmail = require('../utils/mailer');
+var ChallengeModel = require('../models/Challenge');
 var GameModel = require('../models/Game');
 var VariantModel = require('../models/Variant');
 var access = require("../utils/access");
 var params = require("../config/parameters");
 
-// Notify about a game (start, new move)
-function tryNotify(uid, gid, vname, subject)
-{
-	UserModel.getOne("id", uid, (err,user) => {
-		if (!!err && user.notify)
-		{
-			sendEmail(params.mailFrom, user.email, subject,
-				params.siteURL + "?v=" + vname + "&g=" + gid, err => {
-				  res.json(err || {}); // TODO: log error somewhere.
-			  }
-      );
-		}
-	});
-}
-
 // From main hall, start game between players 0 and 1
 router.post("/games", access.logged, access.ajax, (req,res) => {
-	const gameInfo = JSON.parse(req.body.gameInfo);
-	if (!gameInfo.players.some(p => p.id == req.user.id))
+  const gameInfo = req.body.gameInfo;
+	if (!gameInfo.players.some(p => p.id == req.userId))
 		return res.json({errmsg: "Cannot start someone else's game"});
-	let fen = req.body.fen;
+  const cid = req.body.cid;
+  ChallengeModel.remove(cid);
+	const fen = req.body.fen;
 	GameModel.create(
     gameInfo.vid, gameInfo.fen, gameInfo.timeControl, gameInfo.players,
-		(err,game) => {
-			access.checkRequest(res, err, game, "Cannot create game", () => {
-				if (!!req.body.offlineOpp)
-					UserModel.tryNotify(req.body.offlineOpp, game.id, variant.name,
-            "New game: " + "game link"); //TODO: give game link
-				res.json({game: game});
+		(err,ret) => {
+			access.checkRequest(res, err, ret, "Cannot create game", () => {
+        const oppIdx = (gameInfo.players[0].id == req.userId ? 1 : 0);
+        const oppId = gameInfo.players[oppIdx].id;
+        UserModel.tryNotify(oppId,
+          "New game: " + params.siteURL + "/game/" + ret.gid);
+				res.json({gameId: ret.gid});
 			});
 		}
 	);
@@ -46,7 +34,7 @@ router.get("/games", access.ajax, (req,res) => {
   {
     GameModel.getOne(gameId, (err,game) => {
 		  access.checkRequest(res, err, game, "Game not found", () => {
-			  res.json({game: game});
+        res.json({game: game});
 		  });
 	  });
   }
@@ -56,40 +44,30 @@ router.get("/games", access.ajax, (req,res) => {
     const userId = req.query["uid"];
     const excluded = !!req.query["excluded"];
     GameModel.getByUser(userId, excluded, (err,games) => {
-		  access.checkRequest(res, err, games, "Games not found", () => {
-			  res.json({games: games});
-		  });
+		  if (!!err)
+        return res.json({errmsg: err.errmsg || err.toString()});
+			res.json({games: games});
 	  });
   }
 });
 
-// TODO:
-router.put("/games", access.logged, access.ajax, (req,res) => {
-	let gid = ObjectId(req.body.gid);
-	let result = req.body.result;
-	// NOTE: only game-level life update is "gameover"
-	GameModel.gameOver(gid, result, ObjectId(req.user._id), (err,game) => {
-		access.checkRequest(res, err, game, "Cannot find game", () => {
-			res.json({});
-		});
-	});
-});
-
+// New move + fen update + score, potentially
 // TODO: if newmove fail, takeback in GUI
-// TODO: check move structure
-// TODO: move should contain an optional "message" field ("corr chat" !)
-router.post("/moves", access.logged, access.ajax, (req,res) => {
-	let gid = ObjectId(req.body.gid);
-	let fen = req.body.fen;
-	let vname = req.body.vname; //defined only if !!offlineOpp
-	// NOTE: storing the moves encoded lead to double stringify --> error at parsing
-	let move = JSON.parse(req.body.move);
-	GameModel.addMove(gid, move, fen, req._user._id, (err,game) => {
-		access.checkRequest(res, err, game, "Cannot find game", () => {
-			if (!!req.body.offlineOpp)
-				UserModel.tryNotify(ObjectId(req.body.offlineOpp), gid, vname, "New move");
-			res.json({});
-		});
+router.put("/games", access.logged, access.ajax, (req,res) => {
+  const gid = req.body.gid;
+	const obj = req.body.newObj;
+	GameModel.update(gid, obj, (err) => {
+		if (!!err)
+      return res.json(err);
+    // Notify opponent if he enabled notifications:
+    GameModel.getPlayers(gid, (err2,players) => {
+      if (!!err2)
+        return res.json(err);
+      const oppid = (players[0].id == req.userId ? players[1].id : players[0].id);
+      UserModel.tryNotify(oppid,
+        "New move in game: " + params.siteURL + "/game/" + gid);
+    });
+    res.json({});
 	});
 });