Fix targetted challenge deletion on server when refused

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index 40d125c..2be700b 100644 (file)
--- 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});
@@ -76,7 +76,7 @@ const ChallengeModel =
         "FROM Challenges " +
         "WHERE id = " + id + " " +
           // Condition: I'm the sender or the target
-          "AND (uid = " + uid + " OR to = " + uid + ")";
+          "AND (uid = " + uid + " OR target = " + uid + ")";
       db.get(query, (err,chall) => {
         if (!err && chall)
           ChallengeModel.remove(id);

diff --git a/server/routes/challenges.js b/server/routes/challenges.js
index aee6fd2..680a69f 100644 (file)
--- a/server/routes/challenges.js
+++ b/server/routes/challenges.js
@@ -24,7 +24,7 @@ router.post("/challenges", access.logged, access.ajax, (req,res) => {
     if (req.body.chall.to)
     {
       UserModel.getOne("name", challenge.to, (err,user) => {
-        if (!!err || !user)
+        if (err || !user)
           res.json(err || {errmsg: "Typo in player name"});
         else
         {