feat: #7743, posts/user.js

src/posts/user.js

@@ -11,38 +11,16 @@ var plugins = require('../plugins');
 var privileges = require('../privileges');
 
 module.exports = function (Posts) {
-	Posts.getUserInfoForPosts = function (uids, uid, callback) {
+	Posts.getUserInfoForPosts = async function (uids, uid) {
-		var groupsMap = {};
+		const [userData, userSettings, canUseSignature] = await Promise.all([
-		var userData;
+			getUserData(uids, uid),
-		var userSettings;
+			user.getMultipleUserSettings(uids),
-		var canUseSignature;
+			privileges.global.can('signature', uid),
+		]);
 
-		async.waterfall([
+		var groupTitles = _.uniq(_.flatten(userData.map(u => u && u.groupTitleArray)));
-			function (next) {
+		const groupsMap = {};
-				async.parallel({
+		const groupsData = await groups.getGroupsData(groupTitles);
-					userData: function (next) {
-						getUserData(uids, uid, next);
-					},
-					userSettings: function (next) {
-						user.getMultipleUserSettings(uids, next);
-					},
-					canUseSignature: function (next) {
-						privileges.global.can('signature', uid, next);
-					},
-				}, next);
-			},
-			function (results, next) {
-				userData = results.userData;
-				userSettings = results.userSettings;
-				canUseSignature = results.canUseSignature;
-				var groupTitles = userData.map(function (userData) {
-					return userData && userData.groupTitleArray;
-				});
-				groupTitles = _.uniq(_.flatten(groupTitles));
-
-				groups.getGroupsData(groupTitles, next);
-			},
-			function (groupsData, next) {
 		groupsData.forEach(function (group) {
 			if (group && group.userTitleEnabled && !group.hidden) {
 				groupsMap[group.name] = {
@@ -74,10 +52,8 @@ module.exports = function (Posts) {
 			}
 		});
 
-				async.map(userData, function (userData, next) {
+		return await async.map(userData, async function (userData) {
-					async.waterfall([
+			const results = await async.parallel({
-						function (next) {
-							async.parallel({
 				isMemberOfGroups: function (next) {
 					if (!Array.isArray(userData.groupTitleArray) || !userData.groupTitleArray.length) {
 						return next();
@@ -94,9 +70,8 @@ module.exports = function (Posts) {
 				customProfileInfo: function (next) {
 					plugins.fireHook('filter:posts.custom_profile_info', { profile: [], uid: userData.uid }, next);
 				},
-							}, next);
+			});
-						},
+
-						function (results, next) {
 			if (results.isMemberOfGroups && userData.groupTitleArray) {
 				userData.groupTitleArray.forEach(function (userGroup, index) {
 					if (results.isMemberOfGroups[index] && groupsMap[userGroup]) {
@@ -107,67 +82,43 @@ module.exports = function (Posts) {
 
 			userData.custom_profile_info = results.customProfileInfo.profile;
 
-							plugins.fireHook('filter:posts.modifyUserInfo', userData, next);
+			const result = await plugins.fireHook('filter:posts.modifyUserInfo', userData);
-						},
+			return result;
-					], next);
+		});
-				}, next);
-			},
-		], callback);
 	};
 
-	function getUserData(uids, uid, callback) {
+	async function getUserData(uids, uid) {
 		const fields = [
 			'uid', 'username', 'fullname', 'userslug',
 			'reputation', 'postcount', 'topiccount', 'picture',
 			'signature', 'banned', 'banned:expire', 'status',
 			'lastonline', 'groupTitle',
 		];
-		async.waterfall([
+		const result = await plugins.fireHook('filter:posts.addUserFields', {
-			function (next) {
-				plugins.fireHook('filter:posts.addUserFields', {
 			fields: fields,
 			uid: uid,
 			uids: uids,
-				}, next);
+		});
-			},
+		return await user.getUsersFields(result.uids, _.uniq(result.fields));
-			function (result, next) {
-				user.getUsersFields(result.uids, _.uniq(result.fields), next);
-			},
-		], callback);
 	}
 
-	Posts.isOwner = function (pid, uid, callback) {
+	Posts.isOwner = async function (pids, uid) {
 		uid = parseInt(uid, 10);
-		if (Array.isArray(pid)) {
+		const isArray = Array.isArray(pids);
-			if (uid <= 0) {
+		pids = isArray ? pids : [pids];
-				return setImmediate(callback, null, pid.map(() => false));
-			}
-			Posts.getPostsFields(pid, ['uid'], function (err, posts) {
-				if (err) {
-					return callback(err);
-				}
-				posts = posts.map(post => post && post.uid === uid);
-				callback(null, posts);
-			});
-		} else {
 		if (uid <= 0) {
-				return setImmediate(callback, null, false);
+			return isArray ? pids.map(() => false) : false;
-			}
-			Posts.getPostField(pid, 'uid', function (err, author) {
-				callback(err, author === uid);
-			});
 		}
+		const postData = await Posts.getPostsFields(pids, ['uid']);
+		const result = postData.map(post => post && post.uid === uid);
+		return isArray ? result : result[0];
 	};
 
-	Posts.isModerator = function (pids, uid, callback) {
+	Posts.isModerator = async function (pids, uid) {
 		if (parseInt(uid, 10) <= 0) {
-			return setImmediate(callback, null, pids.map(() => false));
+			return pids.map(() => false);
-		}
-		Posts.getCidsByPids(pids, function (err, cids) {
-			if (err) {
-				return callback(err);
 		}
-			user.isModerator(uid, cids, callback);
+		const cids = await Posts.getCidsByPids(pids);
-		});
+		return await user.isModerator(uid, cids);
 	};
 };