Skip to content

Node.js based forum software built for the modern web

fix: let users who can approve requests join private groups directly (#14398)

palmoni52be954fa360a
diff --git a/src/api/groups.js b/src/api/groups.js
index a75d4b45db..09a02f3947 100644
--- a/src/api/groups.js
+++ b/src/api/groups.js
@@ -171,11 +171,23 @@ groupsAPI.join = async function (caller, data) {
targetUid: data.uid,
});
} else if (isSelf) {
- await groups.requestMembership(groupName, caller.uid);
- logGroupEvent(caller, 'group-request-membership', {
- groupName: groupName,
- targetUid: data.uid,
- });
+ // users who can approve membership requests for this group (owners,
+ // global moderators) would only have to approve themselves, so let
+ // them join immediately instead of queueing a pointless request
+ const canApprove = await isOwner(caller, groupName, false);
+ if (canApprove) {
+ await groups.join(groupName, data.uid);
+ logGroupEvent(caller, 'group-join', {
+ groupName: groupName,
+ targetUid: data.uid,
+ });
+ } else {
+ await groups.requestMembership(groupName, caller.uid);
+ logGroupEvent(caller, 'group-request-membership', {
+ groupName: groupName,
+ targetUid: data.uid,
+ });
+ }
} else {
throw new Error('[[error:not-allowed]]');
}
diff --git a/test/groups.js b/test/groups.js
index 3f9ee81d1b..a646ea6efb 100644
--- a/test/groups.js
+++ b/test/groups.js
@@ -784,6 +784,35 @@ describe('Groups', () => {
await apiGroups.join({ uid: adminUid }, { uid: adminUid, slug: 'global-moderators' });
assert(await Groups.isMember(adminUid, 'Global Moderators'));
});
+
+ it('should let a user who can approve membership requests join a private group immediately', async () => {
+ meta.config.allowPrivateGroups = 1;
+ const uid = await User.create({ username: utils.generateUUID().slice(0, 8) });
+ // global moderators can approve requests for non-system groups
+ await Groups.join('Global Moderators', uid);
+ const slug = await Groups.getGroupField('PrivateCanJoin', 'slug');
+ await apiGroups.join({ uid: uid }, { slug: slug, uid: uid });
+ const [isMember, isPending] = await Promise.all([
+ Groups.isMember(uid, 'PrivateCanJoin'),
+ Groups.isPending(uid, 'PrivateCanJoin'),
+ ]);
+ assert.strictEqual(isMember, true);
+ assert.strictEqual(isPending, false);
+ await Groups.leave('Global Moderators', uid);
+ });
+
+ it('should place a user who cannot approve requests into the pending queue', async () => {
+ meta.config.allowPrivateGroups = 1;
+ const uid = await User.create({ username: utils.generateUUID().slice(0, 8) });
+ const slug = await Groups.getGroupField('PrivateCanJoin', 'slug');
+ await apiGroups.join({ uid: uid }, { slug: slug, uid: uid });
+ const [isMember, isPending] = await Promise.all([
+ Groups.isMember(uid, 'PrivateCanJoin'),
+ Groups.isPending(uid, 'PrivateCanJoin'),
+ ]);
+ assert.strictEqual(isMember, false);
+ assert.strictEqual(isPending, true);
+ });
});
describe('.leave()', () => {