feat: #7743, groups/delete,ownership,posts,user

src/groups/user.js

@@ -1,71 +1,34 @@
 'use strict';
 
-var async = require('async');
-
-var db = require('../database');
-var user = require('../user');
+const db = require('../database');
+const user = require('../user');
 
 module.exports = function (Groups) {
-	Groups.getUsersFromSet = function (set, fields, callback) {
-		if (typeof fields === 'function') {
-			callback = fields;
-			fields = null;
+	Groups.getUsersFromSet = async function (set, fields) {
+		const uids = await db.getSetMembers(set);
+
+		if (fields) {
+			return await user.getUsersFields(uids, fields);
 		}
-		async.waterfall([
-			function (next) {
-				db.getSetMembers(set, next);
-			},
-			function (uids, next) {
-				if (fields) {
-					user.getUsersFields(uids, fields, callback);
-				} else {
-					user.getUsersData(uids, next);
-				}
-			},
-		], callback);
+		return await user.getUsersData(uids);
 	};
 
-	Groups.getUserGroups = function (uids, callback) {
-		Groups.getUserGroupsFromSet('groups:visible:createtime', uids, callback);
+	Groups.getUserGroups = async function (uids) {
+		return await Groups.getUserGroupsFromSet('groups:visible:createtime', uids);
 	};
 
-	Groups.getUserGroupsFromSet = function (set, uids, callback) {
-		async.waterfall([
-			function (next) {
-				Groups.getUserGroupMembership(set, uids, next);
-			},
-			function (memberOf, next) {
-				async.map(memberOf, function (memberOf, next) {
-					Groups.getGroupsData(memberOf, next);
-				}, next);
-			},
-		], callback);
+	Groups.getUserGroupsFromSet = async function (set, uids) {
+		const memberOf = await Groups.getUserGroupMembership(set, uids);
+		return await Promise.all(memberOf.map(memberOf => Groups.getGroupsData(memberOf)));
 	};
 
-	Groups.getUserGroupMembership = function (set, uids, callback) {
-		async.waterfall([
-			function (next) {
-				db.getSortedSetRevRange(set, 0, -1, next);
-			},
-			function (groupNames, next) {
-				async.map(uids, function (uid, next) {
-					async.waterfall([
-						function (next) {
-							Groups.isMemberOfGroups(uid, groupNames, next);
-						},
-						function (isMembers, next) {
-							var memberOf = [];
-							isMembers.forEach(function (isMember, index) {
-								if (isMember) {
-									memberOf.push(groupNames[index]);
-								}
-							});
-
-							next(null, memberOf);
-						},
-					], next);
-				}, next);
-			},
-		], callback);
+	Groups.getUserGroupMembership = async function (set, uids) {
+		const groupNames = await db.getSortedSetRevRange(set, 0, -1);
+		return await Promise.all(uids.map(uid => findUserGroups(uid, groupNames)));
 	};
+
+	async function findUserGroups(uid, groupNames) {
+		const isMembers = await Groups.isMemberOfGroups(uid, groupNames);
+		return groupNames.filter((name, i) => isMembers[i]);
+	}
 };