X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=fabeb7aeca79989a0511b22dfe6f2e8cea3c05c7;hb=5a958354b8675886d7855ef036fa0eb1c433e45b;hp=fa0407dcc8ea4a6945d352e419247c37a92bd716;hpb=58e7b94e6e1a8d5721b9211b45c40e65fc13f600;p=vchess.git

diff --git a/server/models/Challenge.js b/server/models/Challenge.js
index fa0407dc..fabeb7ae 100644
--- a/server/models/Challenge.js
+++ b/server/models/Challenge.js
@@ -56,14 +56,17 @@ const ChallengeModel =
     });
   },
 
-  // All challenges except where target is defined and not me
+  // All challenges except where target is defined and not me,
+  // and I'm not the sender.
   getByUser: function(uid, cb)
   {
     db.serialize(function() {
       const query =
         "SELECT * " +
         "FROM Challenges " +
-        "WHERE target IS NULL OR target = " + uid;
+        "WHERE target IS NULL" +
+          " OR uid = " + uid +
+          " OR target = " + uid;
       db.all(query, (err,challenges) => {
         return cb(err, challenges);
       });
@@ -104,14 +107,14 @@ const ChallengeModel =
     const day = 86400000;
     db.serialize(function() {
       const query =
-        "SELECT id, target " +
+        "SELECT id, target, added " +
         "FROM Challenges";
       db.all(query, (err, challenges) => {
         challenges.forEach(c => {
           if ((!c.target && tsNow - c.added > 30*day) ||
             (!!c.target && tsNow - c.added > 2*day))
           {
-            db.run("DELETE FROM CHallenges WHERE id = " + c.id);
+            db.run("DELETE FROM Challenges WHERE id = " + c.id);
           }
         });
       });