Merge branch 'develop' into SUP-630

.changeset/blue-rats-kick.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Fixes Unit's `numDepartments` property not being updated after a department is removed

.changeset/chilled-seas-refuse.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Fixes the subprocess restarting routine failing to correctly restart apps in some cases

.changeset/fair-carrots-trade.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Fixes "Average first response time" and "Best first response time" metrics being associated with the last agent who served the room (instead of the first one)

.changeset/four-cows-sin.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where room members menu doesn't display properly without enough space

.changeset/giant-nails-trade.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Adds simple app subprocess metrics report

.changeset/green-queens-end.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes an issue with Federation startup where the bridge would intermittently fail to start causing error being shown "Matrix Bridge isn't running yet".

.changeset/honest-kings-allow.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Attempts to restart an app subprocess if the spawn command fails

.changeset/lemon-singers-exercise.md

@@ -0,0 +1,13 @@
+---
+"@rocket.chat/i18n": patch
+---
+
+Changes the wording for voice call permissions, improving consistency and clarity.
+
+- `Manage Voip Extension` -> `Manage Voice Calls`
+  > Permission to manage voice calls and assign extensions to users
+- `View VoIP extension details` -> `View Voice Call Extensions`
+  > Permission to view which user is calling and their extension info
+- `View User VoIP extension` -> `Allow Voice Calls`
+  > Permission to allow users to use the voice call feature
+

.changeset/nervous-fireants-wash.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Allows default avatars to be generated with more than one inital (limited to first 3) when setting `Use Full Name Initials to Generate Default Avatar` is true.

.changeset/quiet-radios-fry.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Fixes an issue while collecting the error message from a failed restart attempt of an app subprocess

.changeset/six-snails-study.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a behavior of the mentions parser that identified mentions inside markdown links text. Now, these components will be removed from the text before trying to parse mentions.

.changeset/tidy-boxes-hide.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes special characters not being escaped on sidepanel extended view

.changeset/young-dots-cheat.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Prevents app:getStatus requests from timing out in some cases

apps/meteor/app/api/server/v1/rooms.ts

@@ -9,13 +9,15 @@ import {
 	isRoomsExportProps,
 	isRoomsIsMemberProps,
 	isRoomsCleanHistoryProps,
+	isRoomsOpenProps,
 } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { isTruthy } from '../../../../lib/isTruthy';
 import { omit } from '../../../../lib/utils/omit';
 import * as dataExport from '../../../../server/lib/dataExport';
 import { eraseRoom } from '../../../../server/lib/eraseRoom';
+import { openRoom } from '../../../../server/lib/openRoom';
 import { muteUserInRoom } from '../../../../server/methods/muteUserInRoom';
 import { unmuteUserInRoom } from '../../../../server/methods/unmuteUserInRoom';
 import { canAccessRoomAsync, canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
@@ -893,3 +895,17 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'rooms.open',
+	{ authRequired: true, validateParams: isRoomsOpenProps },
+	{
+		async post() {
+			const { roomId } = this.bodyParams;
+
+			await openRoom(this.userId, roomId);
+
+			return API.v1.success();
+		},
+	},
+);

apps/meteor/app/autotranslate/client/lib/actionButton.ts

@@ -1,96 +1,7 @@
 import { Meteor } from 'meteor/meteor';
-import { Tracker } from 'meteor/tracker';
 
 import { AutoTranslate } from './autotranslate';
-import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
-import {
-	hasTranslationLanguageInAttachments,
-	hasTranslationLanguageInMessage,
-} from '../../../../client/views/room/MessageList/lib/autoTranslate';
-import { hasAtLeastOnePermission } from '../../../authorization/client';
-import { Messages } from '../../../models/client';
-import { settings } from '../../../settings/client';
-import { MessageAction } from '../../../ui-utils/client/lib/MessageAction';
-import { sdk } from '../../../utils/client/lib/SDKClient';
 
 Meteor.startup(() => {
 	AutoTranslate.init();
-
-	Tracker.autorun(() => {
-		if (settings.get('AutoTranslate_Enabled') && hasAtLeastOnePermission(['auto-translate'])) {
-			MessageAction.addButton({
-				id: 'translate',
-				icon: 'language',
-				label: 'Translate',
-				context: ['message', 'message-mobile', 'threads'],
-				type: 'interaction',
-				action(_, { message }) {
-					const language = AutoTranslate.getLanguage(message.rid);
-					if (!hasTranslationLanguageInMessage(message, language) && !hasTranslationLanguageInAttachments(message.attachments, language)) {
-						(AutoTranslate.messageIdsToWait as any)[message._id] = true;
-						Messages.update({ _id: message._id }, { $set: { autoTranslateFetching: true } });
-						void sdk.call('autoTranslate.translateMessage', message, language);
-					}
-					const action = 'autoTranslateShowInverse' in message ? '$unset' : '$set';
-					Messages.update({ _id: message._id }, { [action]: { autoTranslateShowInverse: true } });
-				},
-				condition({ message, subscription, user, room }) {
-					if (!user) {
-						return false;
-					}
-					const language = subscription?.autoTranslateLanguage || AutoTranslate.getLanguage(message.rid) || '';
-					const isLivechatRoom = roomCoordinator.isLivechatRoom(room?.t);
-					const isDifferentUser = message?.u && message.u._id !== user._id;
-					const autoTranslateEnabled = subscription?.autoTranslate || isLivechatRoom;
-					const hasLanguage =
-						hasTranslationLanguageInMessage(message, language) || hasTranslationLanguageInAttachments(message.attachments, language);
-
-					return Boolean(
-						(message as { autoTranslateShowInverse?: boolean }).autoTranslateShowInverse ||
-							(isDifferentUser && autoTranslateEnabled && !hasLanguage),
-					);
-				},
-				order: 90,
-			});
-			MessageAction.addButton({
-				id: 'view-original',
-				icon: 'language',
-				label: 'View_original',
-				context: ['message', 'message-mobile', 'threads'],
-				type: 'interaction',
-				action(_, props) {
-					const { message } = props;
-					const language = AutoTranslate.getLanguage(message.rid);
-					if (!hasTranslationLanguageInMessage(message, language) && !hasTranslationLanguageInAttachments(message.attachments, language)) {
-						(AutoTranslate.messageIdsToWait as any)[message._id] = true;
-						Messages.update({ _id: message._id }, { $set: { autoTranslateFetching: true } });
-						void sdk.call('autoTranslate.translateMessage', message, language);
-					}
-					const action = 'autoTranslateShowInverse' in message ? '$unset' : '$set';
-					Messages.update({ _id: message._id }, { [action]: { autoTranslateShowInverse: true } });
-				},
-				condition({ message, subscription, user, room }) {
-					const language = subscription?.autoTranslateLanguage || AutoTranslate.getLanguage(message.rid) || '';
-					const isLivechatRoom = roomCoordinator.isLivechatRoom(room?.t);
-					if (!user) {
-						return false;
-					}
-					const isDifferentUser = message?.u && message.u._id !== user._id;
-					const autoTranslateEnabled = subscription?.autoTranslate || isLivechatRoom;
-					const hasLanguage =
-						hasTranslationLanguageInMessage(message, language) || hasTranslationLanguageInAttachments(message.attachments, language);
-
-					return Boolean(
-						!(message as { autoTranslateShowInverse?: boolean }).autoTranslateShowInverse &&
-							isDifferentUser &&
-							autoTranslateEnabled &&
-							hasLanguage,
-					);
-				},
-				order: 90,
-			});
-		} else {
-			MessageAction.removeButton('toggle-language');
-		}
-	});
 });

apps/meteor/app/autotranslate/client/lib/autotranslate.ts

@@ -37,7 +37,7 @@ Meteor.startup(() => {
 export const AutoTranslate = {
 	initialized: false,
 	providersMetadata: {} as { [providerNamer: string]: { name: string; displayName: string } },
-	messageIdsToWait: {} as { [messageId: string]: string },
+	messageIdsToWait: {} as { [messageId: string]: boolean },
 	supportedLanguages: [] as ISupportedLanguage[] | undefined,
 
 	findSubscriptionByRid: mem((rid) => Subscriptions.findOne({ rid })),

apps/meteor/app/lib/server/functions/addUserToRoom.ts

@@ -20,9 +20,11 @@ export const addUserToRoom = async function (
 	{
 		skipSystemMessage,
 		skipAlertSound,
+		createAsHidden = false,
 	}: {
 		skipSystemMessage?: boolean;
 		skipAlertSound?: boolean;
+		createAsHidden?: boolean;
 	} = {},
 ): Promise<boolean | undefined> {
 	const now = new Date();
@@ -84,8 +86,8 @@ export const addUserToRoom = async function (
 
 	const { insertedId } = await Subscriptions.createWithRoomAndUser(room, userToBeAdded as IUser, {
 		ts: now,
-		open: true,
-		alert: !skipAlertSound,
+		open: !createAsHidden,
+		alert: createAsHidden ? false : !skipAlertSound,
 		unread: 1,
 		userMentions: 1,
 		groupMentions: 0,

apps/meteor/app/lib/server/functions/createRoom.ts

@@ -74,9 +74,7 @@ async function createUsersSubscriptions({
 
 		memberIds.push(member._id);
 
-		const extra: Partial<ISubscriptionExtraData> = options?.subscriptionExtra || {};
-
-		extra.open = true;
+		const extra: Partial<ISubscriptionExtraData> = { open: true, ...options?.subscriptionExtra };
 
 		if (room.prid) {
 			extra.prid = room.prid;

apps/meteor/app/livechat/server/lib/Helper.ts

@@ -97,7 +97,7 @@ export const createLivechatRoom = async (
 	const source = extraRoomInfo.source || roomInfo.source;
 
 	if (settings.get<string>('Livechat_Require_Contact_Verification') === 'always') {
-		await LivechatContacts.updateContactChannel({ visitorId: _id, source }, { verified: false });
+		await LivechatContacts.setChannelVerifiedStatus({ visitorId: _id, source }, false);
 	}
 
 	const contactId = await migrateVisitorIfMissingContact(_id, source);

apps/meteor/app/livechat/server/lib/departmentsLib.ts

@@ -231,8 +231,8 @@ export async function setDepartmentForGuest({ token, department }: { token: stri
 export async function removeDepartment(departmentId: string) {
 	livechatLogger.debug(`Removing department: ${departmentId}`);
 
-	const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'businessHourId'>>(departmentId, {
-		projection: { _id: 1, businessHourId: 1 },
+	const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'businessHourId' | 'parentId'>>(departmentId, {
+		projection: { _id: 1, businessHourId: 1, parentId: 1 },
 	});
 	if (!department) {
 		throw new Error('error-department-not-found');

apps/meteor/app/mentions/lib/MentionsParser.ts

@@ -119,11 +119,17 @@ export class MentionsParser {
 			return this.roomTemplate({ prefix, reference, channel, mention });
 		});
 
-	getUserMentions(str: string) {
+	getUserMentions(msg: string) {
+		// First remove the text inside md links
+		const str = msg.replace(/\[[^\]]*\]\([^)]+\)/g, '');
+		// Then do the match
 		return (str.match(this.userMentionRegex) || []).map((match) => match.trim());
 	}
 
-	getChannelMentions(str: string) {
+	getChannelMentions(msg: string) {
+		// First remove the text inside md links
+		const str = msg.replace(/\[[^\]]*\]\([^)]+\)/g, '');
+		// Then do the match
 		return (str.match(this.channelMentionRegex) || []).map((match) => match.trim());
 	}
 

apps/meteor/app/notification-queue/server/NotificationQueue.ts

@@ -102,7 +102,7 @@ class NotificationClass {
 			return true;
 		}
 
-		return this.worker(counter++);
+		return this.worker(++counter);
 	}
 
 	getNextNotification(): Promise<INotification | null> {

apps/meteor/app/ui-utils/client/index.ts

@@ -1,6 +1,3 @@
-import './lib/messageActionDefault';
-
-export { MessageAction } from './lib/MessageAction';
 export { messageBox } from './lib/messageBox';
 export { LegacyRoomManager } from './lib/LegacyRoomManager';
 export { upsertMessage, RoomHistoryManager } from './lib/RoomHistoryManager';