Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: move start/stop every iteration

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-02-10 13:49:04 -05:00
parent 4abe5eb7ff
commit dd3893b134
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/groups/index.js
View File

@@ -154,12 +154,17 @@ Groups.getOwnersAndMembers = async function (groupName, uid, start, stop) {
} }
}); });
let done = false;
let returnUsers = owners; let returnUsers = owners;
const memberStart = Math.max(0, start - ownerUids.length + 1); let memberStart = start - ownerUids.length + 1;
const memberStop = memberStart + countToReturn; let memberStop = memberStart + countToReturn - 1;
memberStart = Math.max(0, memberStart);
memberStop = Math.max(0, memberStop);
async function addMembers(start, stop) { async function addMembers(start, stop) {
let batch = await user.getUsersFromSet('group:' + groupName + ':members', uid, start, stop); let batch = await user.getUsersFromSet('group:' + groupName + ':members', uid, start, stop);
if (!batch.length) {
done = true;
}
batch = batch.filter(user => user && user.uid && !ownerUids.includes(user.uid.toString())); batch = batch.filter(user => user && user.uid && !ownerUids.includes(user.uid.toString()));
returnUsers = returnUsers.concat(batch); returnUsers = returnUsers.concat(batch);
} }
@@ -167,9 +172,11 @@ Groups.getOwnersAndMembers = async function (groupName, uid, start, stop) {
if (stop === -1) { if (stop === -1) {
await addMembers(memberStart, -1); await addMembers(memberStart, -1);
} else { } else {
while (returnUsers.length < countToReturn) { while (returnUsers.length < countToReturn && !done) {
/* eslint-disable no-await-in-loop */ /* eslint-disable no-await-in-loop */
await addMembers(memberStart, memberStop); await addMembers(memberStart, memberStop);
memberStart += countToReturn;
memberStop += countToReturn;
} }
} }