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(sunset): release candidate

Browse Source
This commit is contained in:
SabreCat
2023-08-07 15:04:44 -05:00
parent a8b52ab656
commit 9fa355fbcc
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import { authWithHeaders } from '../../middlewares/auth';
import {
model as Group,
basicFields as basicGroupFields,
TAVERN_ID,
} from '../../models/group';
import {
model as User,
@@ -411,7 +412,7 @@ api.getGroup = {
const { groupId } = req.params;
const group = await Group.getGroup({ user, groupId, populateLeader: false });
if (!group) {
if (!group || group.type === 'guild' && group._id !== TAVERN_ID && !group.hasActiveGroupPlan()) {
throw new NotFound(res.t('groupNotFound'));
}
@@ -1337,7 +1338,7 @@ api.getGroupPlans = {
async handler (req, res) {
const { user } = res.locals;
const userGroups = user.getGroups();
const userGroups = await user.getGroups();
const groups = await Group
.find({