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

closes #6937

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-11-10 20:51:07 -05:00
parent e12a803b16
commit b6771836cf
17 changed files with 278 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/groups/index.js
View File

@@ -73,6 +73,18 @@ Groups.getGroupsFromSet = function (set, uid, start, stop, callback) {
], callback);
};
Groups.getNonPrivilegeGroups = function (set, start, stop, callback) {
async.waterfall([
function (next) {
db.getSortedSetRevRange(set, start, stop, next);
},
function (groupNames, next) {
groupNames = groupNames.concat(Groups.ephemeralGroups).filter(groupName => !Groups.isPrivilegeGroup(groupName));
Groups.getGroupsData(groupNames, next);
},
], callback);
};
Groups.getGroups = function (set, start, stop, callback) {
db.getSortedSetRevRange(set, start, stop, callback);
};

87
src/groups/membership.js
View File

@@ -164,18 +164,17 @@ module.exports = function (Groups) {
Groups.isMembers = function (uids, groupName, callback) {
var cachedData = {};
function getFromCache() {
setImmediate(callback, null, uids.map(function (uid) {
return cachedData[uid + ':' + groupName];
}));
setImmediate(callback, null, uids.map(uid => cachedData[uid + ':' + groupName]));
}
if (!groupName || !uids.length) {
return callback(null, uids.map(function () { return false; }));
return setImmediate(callback, null, uids.map(() => false));
}
var nonCachedUids = uids.filter(function (uid) {
return filterNonCached(cachedData, uid, groupName);
});
if (groupName === 'guests') {
return setImmediate(callback, null, uids.map(uid => parseInt(uid, 10) === 0));
}
var nonCachedUids = uids.filter(uid => filterNonCached(cachedData, uid, groupName));
if (!nonCachedUids.length) {
return getFromCache(callback);
@@ -196,6 +195,38 @@ module.exports = function (Groups) {
], callback);
};
Groups.isMemberOfGroups = function (uid, groups, callback) {
var cachedData = {};
function getFromCache(next) {
setImmediate(next, null, groups.map(groupName => cachedData[uid + ':' + groupName]));
}
if (!uid || parseInt(uid, 10) <= 0 || !groups.length) {
return callback(null, groups.map(groupName => groupName === 'guests'));
}
var nonCachedGroups = groups.filter(groupName => filterNonCached(cachedData, uid, groupName));
if (!nonCachedGroups.length) {
return getFromCache(callback);
}
async.waterfall([
function (next) {
const nonCachedGroupsMemberSets = nonCachedGroups.map(groupName => 'group:' + groupName + ':members');
db.isMemberOfSortedSets(nonCachedGroupsMemberSets, uid, next);
},
function (isMembers, next) {
nonCachedGroups.forEach(function (groupName, index) {
cachedData[uid + ':' + groupName] = isMembers[index];
Groups.cache.set(uid + ':' + groupName, isMembers[index]);
});
getFromCache(next);
},
], callback);
};
function filterNonCached(cachedData, uid, groupName) {
var isMember = Groups.cache.get(uid + ':' + groupName);
var isInCache = isMember !== undefined;
@@ -208,41 +239,16 @@ module.exports = function (Groups) {
return !isInCache;
}
Groups.isMemberOfGroups = function (uid, groups, callback) {
var cachedData = {};
function getFromCache(next) {
setImmediate(next, null, groups.map(function (groupName) {
return cachedData[uid + ':' + groupName];
}));
Groups.isMemberOfAny = function (uid, groups, callback) {
if (!groups.length) {
return setImmediate(callback, null, false);
}
if (!uid || parseInt(uid, 10) <= 0 || !groups.length) {
return callback(null, groups.map(function () { return false; }));
}
var nonCachedGroups = groups.filter(function (groupName) {
return filterNonCached(cachedData, uid, groupName);
});
if (!nonCachedGroups.length) {
return getFromCache(callback);
}
var nonCachedGroupsMemberSets = nonCachedGroups.map(function (groupName) {
return 'group:' + groupName + ':members';
});
async.waterfall([
function (next) {
db.isMemberOfSortedSets(nonCachedGroupsMemberSets, uid, next);
Groups.isMemberOfGroups(uid, groups, next);
},
function (isMembers, next) {
nonCachedGroups.forEach(function (groupName, index) {
cachedData[uid + ':' + groupName] = isMembers[index];
Groups.cache.set(uid + ':' + groupName, isMembers[index]);
});
getFromCache(next);
next(null, isMembers.some(isMember => !!isMember));
},
], callback);
};
@@ -318,10 +324,7 @@ module.exports = function (Groups) {
Groups.isMembersOfGroupList = function (uids, groupListKey, callback) {
var groupNames;
var results = [];
uids.forEach(function () {
results.push(false);
});
var results = uids.map(() => false);
async.waterfall([
function (next) {