X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=4aae427a28b6dcee37f3bedb91034c95b054913f;hb=ae2c49bb0bbaac3953f63be5b720e9c6835f00b6;hp=01de6b54c014c959f860212780b664ab011465eb;hpb=83494c7fbd83fafa28c5a434a1c83f56c17e3d04;p=vchess.git

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 01de6b54..4aae427a 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -1,4 +1,5 @@
 var 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);
       });
@@ -92,28 +98,6 @@ const ChallengeModel =
       });
     });
   },
-
-  // Remove challenges older than 1 month, and 1to1 older than 2 days
-  removeOld: function()
-  {
-    const tsNow = Date.now();
-    // 86400000 = 24 hours in milliseconds
-    const day = 86400000;
-    db.serialize(function() {
-      const query =
-        "SELECT id, target " +
-        "FROM Challenges";
-      db.all(query, (err, challenges) => {
-        challenges.forEach(c => {
-          if ((!c.target && tsNow - c.added > 30*day) ||
-            (!!c.target && tsNow - c.added > 2*day))
-          {
-            db.run("DELETE FROM CHallenges WHERE id = " + c.id);
-          }
-        });
-      });
-    });
-  },
 }
 
 module.exports = ChallengeModel;