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

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index ba805aa1..7ccaa76f 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:
@@ -21,6 +22,8 @@ const ChallengeModel =
       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 "";
   },
 
@@ -53,7 +56,7 @@ const ChallengeModel =
     });
   },
 
-  // all challenges except where target is defined and not me
+  // All challenges except where target is defined and not me
   getByUser: function(uid, cb)
   {
     db.serialize(function() {
@@ -92,24 +95,28 @@ 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});
-//			}
-//		});
-//	});
-//}
+  // 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, added " +
+        "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;