Real name and translations

apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts

@@ -1,19 +1,20 @@
 import { api } from '@rocket.chat/core-services';
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isDirectMessageRoom, isEditedMessage, isRoomFederated } from '@rocket.chat/core-typings';
-import { Subscriptions, Rooms } from '@rocket.chat/models';
+import { Subscriptions, Rooms, Users, Settings } from '@rocket.chat/models';
 import type { ActionsBlock } from '@rocket.chat/ui-kit';
 import moment from 'moment';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
 import { isTruthy } from '../../../../lib/isTruthy';
 import { i18n } from '../../../../server/lib/i18n';
 import { hasAtLeastOnePermissionAsync, hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 
 const permissionsToAddUserToRoom = ['add-user-to-joined-room', 'add-user-to-any-c-room', 'add-user-to-any-p-room'];
 
 const APP_ID = 'mention-core';
-const getBlocks = (mentions: IMessage['mentions'], messageId: string) => {
+const getBlocks = (mentions: IMessage['mentions'], messageId: string, lng: string | undefined) => {
 	const strigifiedMentions = JSON.stringify(mentions);
 	return {
 		addUsersBlock: {
@@ -24,7 +25,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string) => {
 			actionId: 'add-users',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Add_them'),
+				text: i18n.t('Add_them', undefined, lng),
 			},
 		},
 		dismissBlock: {
@@ -35,7 +36,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string) => {
 			actionId: 'dismiss',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Do_nothing'),
+				text: i18n.t('Do_nothing', undefined, lng),
 			},
 		},
 		dmBlock: {
@@ -46,7 +47,7 @@ const getBlocks = (mentions: IMessage['mentions'], messageId: string) => {
 			actionId: 'share-message',
 			text: {
 				type: 'plain_text',
-				text: i18n.t('Let_them_know'),
+				text: i18n.t('Let_them_know', undefined, lng),
 			},
 		},
 	} as const;
@@ -89,8 +90,9 @@ callbacks.add(
 		const canAddUsers = await hasAtLeastOnePermissionAsync(message.u._id, permissionsToAddUserToRoom, message.rid);
 		const canDMUsers = await hasPermissionAsync(message.u._id, 'create-d'); // TODO: Perhaps check if user has DM with mentioned user (might be too expensive)
 
-		const usernames = mentionsUsersNotInChannel.map(({ username }) => username);
-		const actionBlocks = getBlocks(mentionsUsersNotInChannel, message._id);
+		const { language } = (await Users.findOneById(message.u._id)) || {};
+
+		const actionBlocks = getBlocks(mentionsUsersNotInChannel, message._id, language);
 		const elements: ActionsBlock['elements'] = [
 			canAddUsers && actionBlocks.addUsersBlock,
 			(canAddUsers || canDMUsers) && actionBlocks.dismissBlock,
@@ -101,22 +103,31 @@ callbacks.add(
 			? 'You_mentioned___mentions__but_theyre_not_in_this_room'
 			: 'You_mentioned___mentions__but_theyre_not_in_this_room_You_can_ask_a_room_admin_to_add_them';
 
+		const { value: useRealName } = (await Settings.findOneById('UI_Use_Real_Name')) || {};
+
+		const usernamesOrNames = mentionsUsersNotInChannel.map(
+			({ username, name }) => `*@${getUserDisplayName(name, username, Boolean(useRealName))}*`,
+		);
+
+		const mentionsText = usernamesOrNames.join(', ');
+
 		// TODO: Mentions style
-		// TODO: Use real name setting
 		void api.broadcast('notify.ephemeralMessage', message.u._id, message.rid, {
 			msg: '',
 			mentions: mentionsUsersNotInChannel,
 			blocks: [
 				{
+					appId: APP_ID,
 					type: 'section',
 					text: {
 						type: 'mrkdwn',
-						text: i18n.t(messageLabel, { mentions: `@${usernames.join(', @')}` }),
+						text: i18n.t(messageLabel, { mentions: mentionsText }, language),
 					},
 				} as const,
 				Boolean(elements.length) &&
 					({
 						type: 'actions',
+						appId: APP_ID,
 						elements,
 					} as const),
 			].filter(isTruthy),

apps/meteor/server/modules/core-apps/mention.module.ts

@@ -36,9 +36,13 @@ export class MentionModule implements IUiKitCoreApp {
 
 		if (actionId === 'dismiss') {
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
-					mentions: `@${usernames.join(', @')}`,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room',
+					{
+						mentions: `@${usernames.join(', @')}`,
+					},
+					payload.user.language,
+				),
 				_id: payload.message,
 				mentions,
 			});
@@ -48,9 +52,13 @@ export class MentionModule implements IUiKitCoreApp {
 		if (actionId === 'add-users') {
 			void addUsersToRoomMethod(payload.user._id, { rid: payload.room, users: usernames as string[] }, payload.user);
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room', {
-					mentions: `@${usernames.join(', @')}`,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room',
+					{
+						mentions: `@${usernames.join(', @')}`,
+					},
+					payload.user.language,
+				),
 				_id: payload.message,
 				mentions,
 			});
@@ -83,9 +91,13 @@ export class MentionModule implements IUiKitCoreApp {
 			);
 
 			void api.broadcast('notify.ephemeralMessage', payload.user._id, payload.room, {
-				msg: i18n.t('You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm', {
-					mentions: `@${usernames.join(', @')}`,
-				}),
+				msg: i18n.t(
+					'You_mentioned___mentions__but_theyre_not_in_this_room_You_let_them_know_via_dm',
+					{
+						mentions: `@${usernames.join(', @')}`,
+					},
+					payload.user.language,
+				),
 				_id: payload.message,
 				mentions,
 			});