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

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 0a375c81..e32cd682 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -8,58 +8,39 @@ const UserModel = require("./User");
  *   uid: user id (int)
  *   target: recipient id (optional)
  *   vid: variant id (int)
+ *   options: varchar
  *   fen: varchar (optional)
- *   cadence: string (3m+2s, 7d+1d ...)
+ *   cadence: string (3m+2s, 7d ...)
+ *   options: string (js object)
  */
 
-const ChallengeModel =
-{
-  checkChallenge: function(c)
-  {
-    if (!c.vid.toString().match(/^[0-9]+$/))
-      return "Wrong variant ID";
-    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 "";
-  },
+const ChallengeModel = {
 
-  // fen cannot be undefined
-  create: function(c, cb)
-  {
-    db.serialize(function() {
-      const query =
-        "INSERT INTO Challenges " +
-        "(added, uid, " + (!!c.to ? "target, " : "") + "vid, fen, cadence) " +
-          "VALUES " +
-        "(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
-          c.vid + ",'" + c.fen + "','" + c.cadence + "')";
-      db.run(query, function(err) {
-        return cb(err, {cid: this.lastID});
-      });
-    });
+  checkChallenge: function(c) {
+    return (
+      c.vid.toString().match(/^[0-9]+$/) &&
+      c.cadence.match(/^[0-9dhms +]+$/) &&
+      c.fen.match(/^[a-zA-Z0-9, /-]*$/) &&
+      (!c.to || UserModel.checkNameEmail({ name: c.to }))
+    );
   },
 
-  getOne: function(id, cb)
-  {
+  create: function(c, cb) {
     db.serialize(function() {
       const query =
-        "SELECT * " +
-        "FROM Challenges " +
-        "WHERE id = " + id;
-      db.get(query, (err,challenge) => {
-        return cb(err, challenge);
+        "INSERT INTO Challenges " +
+          "(added, uid, " + (c.to ? "target, " : "") +
+          "vid, options, fen, cadence) " +
+        "VALUES (" + Date.now() + "," + c.uid + "," + (c.to ? c.to + "," : "")
+          + c.vid + ",?,'" + c.fen + "','" + c.cadence + "')";
+      db.run(query, c.options, function(err) {
+        cb(err, { id: this.lastID });
       });
     });
   },
 
-  // All challenges except where target is defined and not me,
-  // and I'm not the sender.
-  getByUser: function(uid, cb)
-  {
+  // All challenges related to user with ID uid
+  getByUser: function(uid, cb) {
     db.serialize(function() {
       const query =
         "SELECT * " +
@@ -67,14 +48,13 @@ const ChallengeModel =
         "WHERE target IS NULL" +
           " OR uid = " + uid +
           " OR target = " + uid;
-      db.all(query, (err,challenges) => {
-        return cb(err, challenges);
+      db.all(query, (err, challenges) => {
+        cb(err, challenges);
       });
     });
   },
 
-  remove: function(id)
-  {
+  remove: function(id) {
     db.serialize(function() {
       const query =
         "DELETE FROM Challenges " +
@@ -83,21 +63,21 @@ const ChallengeModel =
     });
   },
 
-  safeRemove: function(id, uid, cb)
-  {
+  safeRemove: function(id, uid) {
     db.serialize(function() {
       const query =
         "SELECT 1 " +
         "FROM Challenges " +
-        "WHERE id = " + id + " AND uid = " + uid;
+        "WHERE id = " + id + " " +
+          // Condition: I'm the sender or the target
+          "AND (uid = " + uid + " OR target = " + uid + ")";
       db.get(query, (err,chall) => {
-        if (!chall)
-          return cb({errmsg: "Not your challenge"});
-        ChallengeModel.remove(id);
-        cb(null);
+        if (!err && chall)
+          ChallengeModel.remove(id);
       });
     });
-  },
-}
+  }
+
+};
 
 module.exports = ChallengeModel;