X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fgames.js;h=24e97471c2a507a67d86e9472f6b19e43ea67539;hb=8c564f462f5406fcd311d4733f851daf6ada665d;hp=c1fa976570c117ff21faa34cc0e7aae60cb72d52;hpb=25996aedafba5e983f324ada3db1da59206bec0a;p=vchess.git

diff --git a/server/routes/games.js b/server/routes/games.js
index c1fa9765..24e97471 100644
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -1,46 +1,33 @@
 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});
 			});
 		}
 	);
 });
 
-// game page
 router.get("/games", access.ajax, (req,res) => {
 	const gameId = req.query["gid"];
 	if (!!gameId)
@@ -57,50 +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:
+//////////////////////////////////
+
+// TODO: new move
 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) => {
+	GameModel.gameOver(gid, result, ObjectId(req.userId), (err,game) => {
 		access.checkRequest(res, err, game, "Cannot find game", () => {
 			res.json({});
 		});
 	});
 });
 
-// variant page
-router.get("/gamesbyvariant", access.logged, access.ajax, (req,res) => {
-	if (req.query["uid"] != req.user._id)
-		return res.json({errmsg: "Not your games"});
-	let uid = ObjectId(req.query["uid"]);
-	let vid = ObjectId(req.query["vid"]);
-	GameModel.getByVariant(uid, vid, (err,gameArray) => {
-		// NOTE: res.json already stringify, no need to do it manually
-		res.json(err || {games: gameArray});
-	});
-});
-
-// For index: only moves count + myColor
-router.get("/gamesbyplayer", access.logged, access.ajax, (req,res) => {
-	if (req.query["uid"] != req.user._id)
-		return res.json({errmsg: "Not your games"});
-	let uid = ObjectId(req.query["uid"]);
-	GameModel.getByPlayer(uid, (err,games) => {
-		res.json(err || {games: games});
-	});
-});
-
 // TODO: if newmove fail, takeback in GUI
 // TODO: check move structure
-// TODO: for corr games, move should contain an optional "message" field ("corr chat" !)
+// 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;