X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=2be700bd04f8152a1224183971f6929589a983a6;hb=e57c4de4148d43e7635e09adcde4e56585aea303;hp=243da709d697f3dac38e7b4f06bfbb8040b95bfd;hpb=7ba4a5bc5b64e19a1e7f26aa232d5c50770d07ad;p=vchess.git diff --git a/server/models/Challenge.js b/server/models/Challenge.js index 243da709..2be700bd 100644 --- a/server/models/Challenge.js +++ b/server/models/Challenge.js @@ -31,10 +31,10 @@ const ChallengeModel = db.serialize(function() { const query = "INSERT INTO Challenges " + - "(added, uid, " + (!!c.to ? "target, " : "") + + "(added, uid, " + (c.to ? "target, " : "") + "vid, randomness, fen, cadence) " + "VALUES " + - "(" + Date.now() + "," + c.uid + "," + (!!c.to ? c.to + "," : "") + + "(" + 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}); @@ -74,7 +74,9 @@ const ChallengeModel = 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);