1 files changed, 39 insertions, 27 deletions

diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index 7e7f5dc488..b8c6ff25c4 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -1,56 +1,68 @@
 /**
  * Module dependencies
  */
-import $ from 'cafy';
+import $ from 'cafy'; import ID from '../../../../cafy-id';
 import User, { pack } from '../../../../models/user';
 import resolveRemoteUser from '../../../../remote/resolve-user';
 
 const cursorOption = { fields: { data: false } };
 
 /**
- * Show a user
+ * Show user(s)
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	let user;
 
 	// Get 'userId' parameter
-	const [userId, userIdErr] = $(params.userId).optional.id().$;
+	const [userId, userIdErr] = $.type(ID).optional().get(params.userId);
 	if (userIdErr) return rej('invalid userId param');
 
+	// Get 'userIds' parameter
+	const [userIds, userIdsErr] = $.arr($.type(ID)).optional().get(params.userIds);
+	if (userIdsErr) return rej('invalid userIds param');
+
 	// Get 'username' parameter
-	const [username, usernameErr] = $(params.username).optional.string().$;
+	const [username, usernameErr] = $.str.optional().get(params.username);
 	if (usernameErr) return rej('invalid username param');
 
 	// Get 'host' parameter
-	const [host, hostErr] = $(params.host).nullable.optional.string().$;
+	const [host, hostErr] = $.str.optional().nullable().get(params.host);
 	if (hostErr) return rej('invalid host param');
 
-	if (userId === undefined && typeof username !== 'string') {
-		return rej('userId or pair of username and host is required');
-	}
+	if (userIds) {
+		const users = await User.find({
+			_id: {
+				$in: userIds
+			}
+		});
 
-	// Lookup user
-	if (typeof host === 'string') {
-		try {
-			user = await resolveRemoteUser(username, host, cursorOption);
-		} catch (e) {
-			console.warn(`failed to resolve remote user: ${e}`);
-			return rej('failed to resolve remote user');
-		}
+		res(await Promise.all(users.map(u => pack(u, me, {
+			detail: true
+		}))));
 	} else {
-		const q = userId !== undefined
-			? { _id: userId }
-			: { usernameLower: username.toLowerCase(), host: null };
+		// Lookup user
+		if (typeof host === 'string') {
+			try {
+				user = await resolveRemoteUser(username, host, cursorOption);
+			} catch (e) {
+				console.warn(`failed to resolve remote user: ${e}`);
+				return rej('failed to resolve remote user');
+			}
+		} else {
+			const q = userId !== undefined
+				? { _id: userId }
+				: { usernameLower: username.toLowerCase(), host: null };
 
-		user = await User.findOne(q, cursorOption);
+			user = await User.findOne(q, cursorOption);
 
-		if (user === null) {
-			return rej('user not found');
+			if (user === null) {
+				return rej('user not found');
+			}
 		}
-	}
 
-	// Send response
-	res(await pack(user, me, {
-		detail: true
-	}));
+		// Send response
+		res(await pack(user, me, {
+			detail: true
+		}));
+	}
 });