requested changes

RocketChat · Jan 22, 2024 · 8278597 · 8278597
1 parent aa9d791
commit 8278597
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
@@ -1261,12 +1261,25 @@ API.v1.addRoute(
 	{ authRequired: true, validateParams: isUsersGetNamesParamsGETProps },
 	{
 		async get() {
-			const users = await Users.findByUsernames(this.queryParams.usernames, {
-				projection: {
-					name: 1,
-					username: 1,
-				},
-			}).toArray();
+			let users: Pick<IUser, '_id' | 'username' | 'name'>[] = [];
+
+			if ('userIds' in this.queryParams) {
+				users = await Users.findByIds(this.queryParams.userIds, {
+					projection: {
+						name: 1,
+						username: 1,
+					},
+				}).toArray();
+			}
+
+			if ('usernames' in this.queryParams) {
+				users = await Users.findByUsernames(this.queryParams.usernames, {
+					projection: {
+						name: 1,
+						username: 1,
+					},
+				}).toArray();
+			}
 
 			return API.v1.success({
 				users,

diff --git a/apps/meteor/client/components/message/content/reactions/Reaction.tsx b/apps/meteor/client/components/message/content/reactions/Reaction.tsx
@@ -61,7 +61,7 @@ const Reaction = ({ hasReacted, counter, name, names, ...props }: ReactionProps)
 			}
 
 			const users: string[] = showRealName
-				? (await getNames({ usernames: names }))?.users?.map((user) => user.name) || []
+				? (await getNames({ usernames: names }))?.users?.map((user) => user.name) || names.map((name) => `@${name}`)
 				: names.map((name) => `@${name}`);
 
 			return users;