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

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 243da709..e32cd682 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -8,43 +8,39 @@ const UserModel = require("./User");
  *   uid: user id (int)
  *   target: recipient id (optional)
  *   vid: variant id (int)
- *   randomness: integer in 0..2
+ *   options: varchar
  *   fen: varchar (optional)
  *   cadence: string (3m+2s, 7d ...)
+ *   options: string (js object)
  */
 
-const ChallengeModel =
-{
-  checkChallenge: function(c)
-  {
+const ChallengeModel = {
+
+  checkChallenge: function(c) {
     return (
       c.vid.toString().match(/^[0-9]+$/) &&
       c.cadence.match(/^[0-9dhms +]+$/) &&
-      c.randomness.toString().match(/^[0-2]$/) &&
       c.fen.match(/^[a-zA-Z0-9, /-]*$/) &&
-      (!c.to || UserModel.checkNameEmail({name: c.to}))
+      (!c.to || UserModel.checkNameEmail({ name: c.to }))
     );
   },
 
-  create: function(c, cb)
-  {
+  create: function(c, cb) {
     db.serialize(function() {
       const query =
         "INSERT INTO Challenges " +
-          "(added, uid, " + (!!c.to ? "target, " : "") +
-          "vid, randomness, fen, cadence) " +
-        "VALUES " +
-          "(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") +
-          c.vid + "," + c.randomness + ",'" + c.fen + "','" + c.cadence + "')";
-      db.run(query, function(err) {
-        cb(err, {cid: this.lastID});
+          "(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 related to user with ID uid
-  getByUser: function(uid, cb)
-  {
+  getByUser: function(uid, cb) {
     db.serialize(function() {
       const query =
         "SELECT * " +
@@ -52,14 +48,13 @@ const ChallengeModel =
         "WHERE target IS NULL" +
           " OR uid = " + uid +
           " OR target = " + uid;
-      db.all(query, (err,challenges) => {
+      db.all(query, (err, challenges) => {
         cb(err, challenges);
       });
     });
   },
 
-  remove: function(id)
-  {
+  remove: function(id) {
     db.serialize(function() {
       const query =
         "DELETE FROM Challenges " +
@@ -68,19 +63,21 @@ const ChallengeModel =
     });
   },
 
-  safeRemove: function(id, uid)
-  {
+  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 (!err && chall)
           ChallengeModel.remove(id);
       });
     });
-  },
-}
+  }
+
+};
 
 module.exports = ChallengeModel;