X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=e32cd682065bb90e8bb5928bda3ed9ef9f9838be;hp=a528ca67f03bf64cd3bafb1d7d04ab177399894f;hb=eb2d61de8d569470fa329a484efe9bab420b2b82;hpb=d807470f965d4d60a7fe6e1320ac7dfd3f0ea03f diff --git a/server/models/Challenge.js b/server/models/Challenge.js index a528ca67..e32cd682 100644 --- a/server/models/Challenge.js +++ b/server/models/Challenge.js @@ -8,9 +8,10 @@ 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 = { @@ -19,7 +20,6 @@ const ChallengeModel = { 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 })) ); @@ -30,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 }); }); });