From 2d7d4a3fb4a5f307086e932b26f1d46ecc499a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Fri, 16 Mar 2018 19:23:06 -0400
Subject: [PATCH] use setsRemove

---
 src/groups/membership.js | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/groups/membership.js b/src/groups/membership.js
index 864fdea81f..6217311139 100644
--- a/src/groups/membership.js
+++ b/src/groups/membership.js
@@ -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),