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

fix(lint): or/and, import

Browse Source
This commit is contained in:
SabreCat
2023-08-07 21:33:31 -05:00
parent 1371b80635
commit 39477c6f11
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,7 +267,7 @@ api.joinChallenge = {
const group = await Group.getGroup({ const group = await Group.getGroup({
user, groupId: challenge.group, fields: basicGroupFields, optionalMembership: true, user, groupId: challenge.group, fields: basicGroupFields, optionalMembership: true,
}); });
if (!group || group.type === 'party' && group._id !== user.party._id) { if (!group || (group.type === 'party' && group._id !== user.party._id)) {
throw new NotFound(res.t('challengeNotFound')); throw new NotFound(res.t('challengeNotFound'));
} }
if (group.type === 'guild' && group._id !== TAVERN_ID && !group.hasActiveGroupPlan()) { if (group.type === 'guild' && group._id !== TAVERN_ID && !group.hasActiveGroupPlan()) {

2
website/server/controllers/api-v3/groups.js
View File

@@ -412,7 +412,7 @@ api.getGroup = {
const { groupId } = req.params; const { groupId } = req.params;
const group = await Group.getGroup({ user, groupId, populateLeader: false }); const group = await Group.getGroup({ user, groupId, populateLeader: false });
if (!group || group.type === 'guild' && group._id !== TAVERN_ID && !group.hasActiveGroupPlan()) { if (!group || (group.type === 'guild' && group._id !== TAVERN_ID && !group.hasActiveGroupPlan())) {
throw new NotFound(res.t('groupNotFound')); throw new NotFound(res.t('groupNotFound'));
} }

1
website/server/libs/challenges/index.js
View File

@@ -8,6 +8,7 @@ import {
TAVERN_ID, TAVERN_ID,
} from '../../models/group'; } from '../../models/group';
import { import {
BadRequest,
NotFound, NotFound,
NotAuthorized, NotAuthorized,
} from '../errors'; } from '../errors';