});
},
- // 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);
});
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);
}
});
});