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

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index dea0ac39..e32cd682 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -8,17 +8,18 @@ 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) {
     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 }))
     );
@@ -29,11 +30,10 @@ const ChallengeModel = {
       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) {
+          "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 });
       });
     });
@@ -76,7 +76,8 @@ const ChallengeModel = {
           ChallengeModel.remove(id);
       });
     });
-  },
-}
+  }
+
+};
 
 module.exports = ChallengeModel;