Node.js based forum software built for the modern web
Merge branch 'master' into develop
Barış Soner Uşaklıe4fa4319463e
diff --cc src/api/groups.jsindex b7b025b09d,6705089799..0459c3cf79--- a/src/api/groups.js+++ b/src/api/groups.js@@@ -223,15 -224,18 +235,22 @@@ groupsAPI.leave = async function (calleif (typeof groupName !== 'string') {throw new Error('[[error:invalid-group-name]]');}+ const isLeavingAdmin = groupName === 'administrators';- if (groupName === 'administrators' && isSelf) {- throw new Error('[[error:cant-remove-self-as-admin]]');+ if (isLeavingAdmin) {+ if (isSelf) {+ throw new Error('[[error:cant-remove-self-as-admin]]');+ }+ const count = await groups.getMemberCount('administrators');+ if (count === 1) {+ throw new Error('[[error:cant-remove-last-admin]]');+ }}+ if (!isSelf) {+ await adminGroupCheck(caller, groupName);+ }+const [groupData, isCallerOwner, userExists, isMember] = await Promise.all([groups.getGroupData(groupName),isOwner(caller, groupName, false),@@@ -279,13 -288,8 +303,13 @@@ groupsAPI.grant = async (caller, data)const groupName = await groups.getGroupNameByGroupSlug(data.slug);await isOwner(caller, groupName);+ const isMember = await groups.isMember(data.uid, groupName);+ if (!isMember) {+ throw new Error('[[error:group-not-member]]');+ }+await groups.ownership.grant(data.uid, groupName);- logGroupEvent(caller, 'group-owner-grant', {+ await logGroupEvent(caller, 'group-owner-grant', {groupName: groupName,targetUid: data.uid,});@@@ -295,13 -299,8 +319,13 @@@ groupsAPI.rescind = async (caller, dataconst groupName = await groups.getGroupNameByGroupSlug(data.slug);await isOwner(caller, groupName);+ const isMember = await groups.isMember(data.uid, groupName);+ if (!isMember) {+ throw new Error('[[error:group-not-member]]');+ }+await groups.ownership.rescind(data.uid, groupName);- logGroupEvent(caller, 'group-owner-rescind', {+ await logGroupEvent(caller, 'group-owner-rescind', {groupName,targetUid: data.uid,});