X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=0a375c81ad9964160f70151ceab9393a5a54a103;hb=c5c47010b5b50edbdd6bfc40a61ce716c6114e5a;hp=ba805aa1701fc8480608ec7bacf2cb2d38ee858b;hpb=d431028c73d41a22636130bd6aff562762eaf2bb;p=vchess.git

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index ba805aa1..0a375c81 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -1,4 +1,5 @@
-var db = require("../utils/database");
+const db = require("../utils/database");
+const UserModel = require("./User");
 
 /*
  * Structure:
@@ -8,7 +9,7 @@ var db = require("../utils/database");
  *   target: recipient id (optional)
  *   vid: variant id (int)
  *   fen: varchar (optional)
- *   timeControl: string (3m+2s, 7d+1d ...)
+ *   cadence: string (3m+2s, 7d+1d ...)
  */
 
 const ChallengeModel =
@@ -17,10 +18,12 @@ const ChallengeModel =
   {
     if (!c.vid.toString().match(/^[0-9]+$/))
       return "Wrong variant ID";
-    if (!c.timeControl.match(/^[0-9dhms +]+$/))
+    if (!c.cadence.match(/^[0-9dhms +]+$/))
       return "Wrong characters in time control";
     if (!c.fen.match(/^[a-zA-Z0-9, /-]*$/))
       return "Bad FEN string";
+    if (!!c.to)
+      return UserModel.checkNameEmail({name: c.to});
     return "";
   },
 
@@ -30,10 +33,10 @@ const ChallengeModel =
     db.serialize(function() {
       const query =
         "INSERT INTO Challenges " +
-        "(added, uid, " + (!!c.to ? "target, " : "") +
-          "vid, fen, timeControl) VALUES " +
+        "(added, uid, " + (!!c.to ? "target, " : "") + "vid, fen, cadence) " +
+          "VALUES " +
         "(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
-          c.vid + ",'" + c.fen + "','" + c.timeControl + "')";
+          c.vid + ",'" + c.fen + "','" + c.cadence + "')";
       db.run(query, function(err) {
         return cb(err, {cid: this.lastID});
       });
@@ -53,14 +56,17 @@ const ChallengeModel =
     });
   },
 
-  // all challenges except where target is defined and not me
+  // All challenges except where target is defined and not me,
+  // and I'm not the sender.
   getByUser: function(uid, cb)
   {
     db.serialize(function() {
       const query =
         "SELECT * " +
         "FROM Challenges " +
-        "WHERE target IS NULL OR target = " + uid;
+        "WHERE target IS NULL" +
+          " OR uid = " + uid +
+          " OR target = " + uid;
       db.all(query, (err,challenges) => {
         return cb(err, challenges);
       });
@@ -94,22 +100,4 @@ const ChallengeModel =
   },
 }
 
-// TODO: adapt
-// Remove challenges older than 1 month, and 1to1 older than 36h
-//exports.removeOld = function()
-//{
-//	var tsNow = new Date().getTime();
-//	// 86400000 = 24 hours in milliseconds
-//	var day = 86400000;
-//	db.challenges.find({}, (err,challengeArray) => {
-//		challengeArray.forEach( c => {
-//			if (c._id.getTimestamp() + 30*day < tsNow //automatch
-//				|| (!!c.to && c._id.getTimestamp() + 1.5*day < tsNow)) //1 to 1
-//			{
-//				db.challenges.remove({"_id": c._id});
-//			}
-//		});
-//	});
-//}
-
 module.exports = ChallengeModel;