sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-13 17:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(challenges): map IDs

Browse source
This commit is contained in:
SabreCat 2023-08-07 23:53:55 -05:00
parent 013f8bcca7
commit d4e3e83d46
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
website/server/controllers/api-v3/challenges.js
View file

@ -397,20 +397,27 @@ api.getUserChallenges = {
const { page } = req.query; const { page } = req.query;
const { user } = res.locals; const { user } = res.locals;
const orOptions = [
{ _id: { $in: user.challenges } }, // Challenges where the user is participating
];
orOptions.push({ leader: user._id }); // Challenges the user owns
const orOptions = [{ leader: user._id }];
// Challenges where the user is participating
if (user.challenges.length > 0) {
orOptions.push({ _id: { $in: user.challenges } });
}
// Challenges in groups user is a member of, plus public challenges
if (!req.query.member) { if (!req.query.member) {
const userGroups = await Group.getGroups({ const userGroups = await Group.getGroups({
user, user,
types: ['party', 'guilds', 'tavern'], types: ['party', 'guilds', 'tavern'],
}); });
const userGroupIds = userGroups.map((userGroup) => {
return userGroup._id;
});
orOptions.push({ orOptions.push({
group: { $in: userGroups }, group: { $in: userGroupIds },
}); // Challenges in groups where I'm a member });
} }
const query = { const query = {