X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fmodels%2FChallenge.js;h=a5fbf63e6e607dd70d87d4717031229909a1dccc;hp=6f8ba0be6047ea8f3ed7609b47dcb3c25ef5814e;hb=f05815d7da84284bd9d7c1ce5b808acd675f2a3e;hpb=4edfed6c011cd97d58d5bd8e0451cc0c1006a0a0 diff --git a/server/models/Challenge.js b/server/models/Challenge.js index 6f8ba0be..a5fbf63e 100644 --- a/server/models/Challenge.js +++ b/server/models/Challenge.js @@ -78,12 +78,15 @@ const ChallengeModel = db.get(query, (err,challengeInfo) => { if (!!err) return cb(err); + let condition = ""; + if (!!challengeInfo.to[0]) + condition = " AND u.name in (" + challengeInfo.to.join(",") + ")"; query = "SELECT w.uid AS id, u.name " + "FROM WillPlay w " + "JOIN Users u " + " ON w.uid = u.id " + - "WHERE w.cid = " + id; + "WHERE w.cid = " + id + condition; db.run(query, (err2,players) => { if (!!err2) return cb(err2); @@ -113,6 +116,7 @@ const ChallengeModel = db.run(query, (err,challIds) => { if (!!err) return cb(err); + challIds = challIds || []; let challenges = []; challIds.forEach(cidRow => { ChallengeModel.getOne(cidRow["cid"], (err2,chall) => {