krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-14 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(challenges): revert to working

Browse Source
This commit is contained in:
SabreCat
2023-08-07 22:00:47 -05:00
parent 39477c6f11
commit c44b1670cf
5 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
website/server/controllers/api-v3/challenges.js
View File

@@ -14,7 +14,6 @@ import {
import {
NotFound,
NotAuthorized,
BadRequest,
} from '../../libs/errors';
import * as Tasks from '../../models/task';
import csvStringify from '../../libs/csvStringify';
@@ -267,12 +266,7 @@ api.joinChallenge = {
const group = await Group.getGroup({
user, groupId: challenge.group, fields: basicGroupFields, optionalMembership: true,
});
if (!group || (group.type === 'party' && group._id !== user.party._id)) {
throw new NotFound(res.t('challengeNotFound'));
}
if (group.type === 'guild' && group._id !== TAVERN_ID && !group.hasActiveGroupPlan()) {
throw new BadRequest(res.t('featureRetired'));
}
if (!group || !challenge.canJoin(user, group)) throw new NotFound(res.t('challengeNotFound'));
const addedSuccessfully = await challenge.addToUser(user);
if (!addedSuccessfully) {
@@ -409,9 +403,8 @@ api.getUserChallenges = {
orOptions.push({ leader: user._id });
if (!req.query.member) {
const userGroups = await user.getGroups();
orOptions.push({
group: { $in: userGroups },
group: { $in: user.getGroups() },
}); // Challenges in groups where I'm a member
}