Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-13 13:21:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: #8154, move start/stop every iteration"

Browse Source 
This reverts commit 300c04cef9.
This commit is contained in:
Barış Soner Uşaklı
2020-02-10 13:47:34 -05:00
parent 300c04cef9
commit 4abe5eb7ff
2 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/groups/index.js
View File

@@ -154,17 +154,12 @@ Groups.getOwnersAndMembers = async function (groupName, uid, start, stop) {
}
});
let done = false;
let returnUsers = owners;
let memberStart = start - ownerUids.length + 1;
let memberStop = memberStart + countToReturn - 1;
memberStart = Math.max(0, memberStart);
memberStop = Math.max(0, memberStop);
const memberStart = Math.max(0, start - ownerUids.length + 1);
const memberStop = memberStart + countToReturn;
async function addMembers(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()));
returnUsers = returnUsers.concat(batch);
}
@@ -172,11 +167,9 @@ Groups.getOwnersAndMembers = async function (groupName, uid, start, stop) {
if (stop === -1) {
await addMembers(memberStart, -1);
} else {
while (returnUsers.length < countToReturn && !done) {
while (returnUsers.length < countToReturn) {
/* eslint-disable no-await-in-loop */
await addMembers(memberStart, memberStop);
memberStart += countToReturn;
memberStop += countToReturn;
}
}