avoid using let

RocketChat · Jan 22, 2024 · 321eea2 · 321eea2
1 parent 2b0cab0
commit 321eea2
Show file tree

Hide file tree

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

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) || names.map((name) => `@${name}`)
+				? (await getNames({ usernames: names }))?.users?.map((user) => user.name || '') || names.map((name) => `@${name}`)
 				: names.map((name) => `@${name}`);
 
 			return users;