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

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 3f713203..ba805aa1 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -15,28 +15,27 @@ const ChallengeModel =
 {
   checkChallenge: function(c)
   {
-    if (!c.vid.match(/^[0-9]+$/))
+    if (!c.vid.toString().match(/^[0-9]+$/))
       return "Wrong variant ID";
-
     if (!c.timeControl.match(/^[0-9dhms +]+$/))
       return "Wrong characters in time control";
-
-    if (!c.fen.match(/^[a-zA-Z0-9, /-]+$/))
+    if (!c.fen.match(/^[a-zA-Z0-9, /-]*$/))
       return "Bad FEN string";
+    return "";
   },
 
   // fen cannot be undefined
   create: function(c, cb)
   {
     db.serialize(function() {
-      let query =
+      const query =
         "INSERT INTO Challenges " +
         "(added, uid, " + (!!c.to ? "target, " : "") +
           "vid, fen, timeControl) VALUES " +
         "(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
           c.vid + ",'" + c.fen + "','" + c.timeControl + "')";
-      db.run(query, err => {
-        return cb(err);
+      db.run(query, function(err) {
+        return cb(err, {cid: this.lastID});
       });
     });
   },
@@ -44,7 +43,7 @@ const ChallengeModel =
   getOne: function(id, cb)
   {
     db.serialize(function() {
-      let query =
+      const query =
         "SELECT * " +
         "FROM Challenges " +
         "WHERE id = " + id;
@@ -62,29 +61,55 @@ const ChallengeModel =
         "SELECT * " +
         "FROM Challenges " +
         "WHERE target IS NULL OR target = " + uid;
-      db.run(query, (err,challenges) => {
+      db.all(query, (err,challenges) => {
         return cb(err, challenges);
       });
     });
   },
 
-  remove: function(id, uid)
+  remove: function(id)
   {
     db.serialize(function() {
-      let query =
+      const query =
+        "DELETE FROM Challenges " +
+        "WHERE id = " + id;
+      db.run(query);
+    });
+  },
+
+  safeRemove: function(id, uid, cb)
+  {
+    db.serialize(function() {
+      const query =
         "SELECT 1 " +
         "FROM Challenges " +
         "WHERE id = " + id + " AND uid = " + uid;
-      db.run(query, (err,rows) => {
-        if (rows.length == 0)
-          return res.json({errmsg: "Not your challenge"});
-        query =
-          "DELETE FROM Challenges " +
-          "WHERE id = " + id;
-        db.run(query);
+      db.get(query, (err,chall) => {
+        if (!chall)
+          return cb({errmsg: "Not your challenge"});
+        ChallengeModel.remove(id);
+        cb(null);
       });
     });
   },
 }
 
+// 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;