prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Still return admins if not allowed to see members

Browse source
This commit is contained in:
Hongbo Wu 2022-12-13 19:05:07 +08:00
parent 943b20f21e
commit 83aa2093eb
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
packages/api/src/services/groups.ts
View file

@ -79,17 +79,16 @@ export const getRecommendationGroups = async (
return groupMembers.map((gm) => {
const admins: GraphqlUser[] = []
const members: GraphqlUser[] = []
// Return all members
gm.group.members.forEach((m) => {
const user = userDataToUser(m.user)
if (m.isAdmin) {
admins.push(user)
}
members.push(user)
})
const canSeeMembers = gm.group.onlyAdminCanSeeMembers ? gm.isAdmin : true
if (canSeeMembers) {
// Return all members
gm.group.members.forEach((m) => {
const user = userDataToUser(m.user)
if (m.isAdmin) {
admins.push(user)
}
members.push(user)
})
}
return {
id: gm.group.id,
@ -98,7 +97,7 @@ export const getRecommendationGroups = async (
updatedAt: gm.group.updatedAt,
inviteUrl: getInviteUrl(gm.invite),
admins,
members,
members: canSeeMembers ? members : [],
topics: gm.group.topics?.split(','),
description: gm.group.description,
canPost: gm.group.onlyAdminCanPost ? gm.isAdmin : true,
@ -151,22 +150,20 @@ having count(*) < $4`,
})
const admins: GraphqlUser[] = []
const members: GraphqlUser[] = []
if (!group.onlyAdminCanSeeMembers) {
// Return all members
group.members.forEach((m) => {
const user = userDataToUser(m.user)
if (m.isAdmin) {
admins.push(user)
}
members.push(user)
})
}
// Return all members
group.members.forEach((m) => {
const user = userDataToUser(m.user)
if (m.isAdmin) {
admins.push(user)
}
members.push(user)
})
return {
...group,
inviteUrl: getInviteUrl(invite),
admins,
members,
members: group.onlyAdminCanSeeMembers ? [] : members,
topics: group.topics?.split(','),
description: group.description,
canPost: !group.onlyAdminCanPost,