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

use setsRemove

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-03-16 19:23:06 -04:00
parent 7221b71b68
commit 2d7d4a3fb4
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/groups/membership.js
View File

@@ -142,19 +142,13 @@ module.exports = function (Groups) {
Groups.acceptMembership = function (groupName, uid, callback) {
async.waterfall([
async.apply(db.setRemove, 'group:' + groupName + ':pending', uid),
async.apply(db.setRemove, 'group:' + groupName + ':invited', uid),
async.apply(db.setsRemove, ['group:' + groupName + ':pending', 'group:' + groupName + ':invited'], uid),
async.apply(Groups.join, groupName, uid),
], callback);
};
Groups.rejectMembership = function (groupName, uid, callback) {
async.parallel([
async.apply(db.setRemove, 'group:' + groupName + ':pending', uid),
async.apply(db.setRemove, 'group:' + groupName + ':invited', uid),
], function (err) {
callback(err);
});
db.setsRemove(['group:' + groupName + ':pending', 'group:' + groupName + ':invited'], uid, callback);
};
Groups.invite = function (groupName, uid, callback) {
@@ -217,19 +211,16 @@ module.exports = function (Groups) {
async.waterfall([
function (next) {
Groups.isMember(uid, groupName, next);
async.parallel({
isMember: async.apply(Groups.isMember, uid, groupName),
exists: async.apply(Groups.exists, groupName),
}, next);
},
function (isMember, next) {
if (!isMember) {
function (result, next) {
if (!result.isMember || !result.exists) {
return callback();
}
Groups.exists(groupName, next);
},
function (exists, next) {
if (!exists) {
return callback();
}
async.parallel([
async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid),
async.apply(db.setRemove, 'group:' + groupName + ':owners', uid),