Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 11:31:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into activitypub

Browse Source
This commit is contained in:
Julian Lam
2024-02-26 16:32:45 -05:00
parent 77a3efb43c 22cd80b9db
commit 3d83a1752e
226 changed files with 3214 additions and 2834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/groups/index.js
View File

@@ -3,6 +3,7 @@
const user = require('../user');
const db = require('../database');
const plugins = require('../plugins');
const privileges = require('../privileges');
const slugify = require('../slugify');
const Groups = module.exports;
@@ -130,30 +131,37 @@ Groups.get = async function (groupName, options) {
stop = (parseInt(options.userListCount, 10) || 4) - 1;
}
const [groupData, members, pending, invited, isMember, isPending, isInvited, isOwner] = await Promise.all([
const [groupData, members, isMember, isPending, isInvited, isOwner, isAdmin, isGlobalMod] = await Promise.all([
Groups.getGroupData(groupName),
Groups.getOwnersAndMembers(groupName, options.uid, 0, stop),
Groups.getPending(groupName),
Groups.getInvites(groupName),
Groups.isMember(options.uid, groupName),
Groups.isPending(options.uid, groupName),
Groups.isInvited(options.uid, groupName),
Groups.ownership.isOwner(options.uid, groupName),
privileges.admin.can('admin:groups', options.uid),
user.isGlobalModerator(options.uid),
]);
if (!groupData) {
return null;
}
groupData.isOwner = isOwner || isAdmin || (isGlobalMod && !groupData.system);
if (groupData.isOwner) {
([groupData.pending, groupData.invited] = await Promise.all([
Groups.getPending(groupName),
Groups.getInvites(groupName),
]));
}
const descriptionParsed = await plugins.hooks.fire('filter:parse.raw', String(groupData.description || ''));
groupData.descriptionParsed = descriptionParsed;
groupData.members = members;
groupData.membersNextStart = stop + 1;
groupData.pending = pending.filter(Boolean);
groupData.invited = invited.filter(Boolean);
groupData.isMember = isMember;
groupData.isPending = isPending;
groupData.isInvited = isInvited;
groupData.isOwner = isOwner;
const results = await plugins.hooks.fire('filter:group.get', { group: groupData });
return results.group;
};

9
src/groups/user.js
View File

@@ -4,13 +4,10 @@ const db = require('../database');
const user = require('../user');
module.exports = function (Groups) {
Groups.getUsersFromSet = async function (set, fields) {
Groups.getUsersFromSet = async function (set, fields = []) {
const uids = await db.getSetMembers(set);
if (fields) {
return await user.getUsersFields(uids, fields);
}
return await user.getUsersData(uids);
const userData = await user.getUsersFields(uids, fields);
return userData.filter(u => u && u.uid);
};
Groups.getUserGroups = async function (uids) {