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

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

@@ -5,7 +5,6 @@ import { authWithHeaders } from '../../middlewares/auth';
import {
model as Group,
basicFields as basicGroupFields,
TAVERN_ID,
} from '../../models/group';
import {
model as User,
@@ -412,7 +411,7 @@ api.getGroup = {
const { groupId } = req.params;
const group = await Group.getGroup({ user, groupId, populateLeader: false });
if (!group || (group.type === 'guild' && group._id !== TAVERN_ID && !group.hasActiveGroupPlan())) {
if (!group) {
throw new NotFound(res.t('groupNotFound'));
}
@@ -565,7 +564,6 @@ api.joinGroup = {
if (!group) throw new NotFound(res.t('groupNotFound'));
let isUserInvited = false;
const seekingParty = Boolean(user.party.seeking);
if (group.type === 'party') {
// Check if was invited to party
@@ -731,7 +729,7 @@ api.joinGroup = {
invited: isUserInvited,
};
if (group.type === 'party') {
analyticsObject.seekingParty = seekingParty;
analyticsObject.seekingParty = Boolean(user.party.seeking);
}
if (group.privacy === 'public') {
analyticsObject.groupName = group.name;
@@ -1339,7 +1337,7 @@ api.getGroupPlans = {
async handler (req, res) {
const { user } = res.locals;
const userGroups = await user.getGroups();
const userGroups = user.getGroups();
const groups = await Group
.find({