Merge branch 'develop' into chore/remove-openroom-method

.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/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/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/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

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/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/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';

apps/meteor/app/ui-utils/client/lib/MessageAction.ts

@@ -1,14 +1,7 @@
-import type { IMessage, IUser, ISubscription, IRoom, SettingValue, ITranslatedMessage } from '@rocket.chat/core-typings';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import mem from 'mem';
-import type { ContextType } from 'react';
 
-import type { AutoTranslateOptions } from '../../../../client/views/room/MessageList/hooks/useAutoTranslate';
-import type { ChatContext } from '../../../../client/views/room/contexts/ChatContext';
-import type { RoomToolboxContextValue } from '../../../../client/views/room/contexts/RoomToolboxContext';
-
-type MessageActionGroup = 'message' | 'menu';
+type MessageActionGroup = 'menu';
 
 export type MessageActionContext =
 	| 'message'
@@ -25,92 +18,17 @@ export type MessageActionContext =
 
 type MessageActionType = 'communication' | 'interaction' | 'duplication' | 'apps' | 'management';
 
-export type MessageActionConditionProps = {
-	message: IMessage;
-	user: IUser | undefined;
-	room: IRoom;
-	subscription?: ISubscription;
-	context?: MessageActionContext;
-	settings: { [key: string]: SettingValue };
-	chat: ContextType<typeof ChatContext>;
-};
-
 export type MessageActionConfig = {
 	id: string;
 	icon: IconName;
 	variant?: 'danger' | 'success' | 'warning';
 	label: TranslationKey;
-	order?: number;
-	/* @deprecated */
-	color?: string;
-	role?: string;
-	group?: MessageActionGroup | MessageActionGroup[];
+	order: number;
+	/** @deprecated */
+	color?: 'alert';
+	group: MessageActionGroup;
 	context?: MessageActionContext[];
-	action: (
-		e: Pick<Event, 'preventDefault' | 'stopPropagation' | 'currentTarget'> | undefined,
-		{
-			message,
-			tabbar,
-			room,
-			chat,
-			autoTranslateOptions,
-		}: {
-			message: IMessage & Partial<ITranslatedMessage>;
-			tabbar: RoomToolboxContextValue;
-			room?: IRoom;
-			chat: ContextType<typeof ChatContext>;
-			autoTranslateOptions?: AutoTranslateOptions;
-		},
-	) => any;
-	condition?: (props: MessageActionConditionProps) => Promise<boolean> | boolean;
+	action: (e: Pick<Event, 'preventDefault' | 'stopPropagation' | 'currentTarget'> | undefined) => any;
 	type?: MessageActionType;
-	disabled?: (props: MessageActionConditionProps) => boolean;
+	disabled?: boolean;
 };
-
-class MessageAction {
-	public buttons: Record<MessageActionConfig['id'], MessageActionConfig> = {};
-
-	public addButton(config: MessageActionConfig): void {
-		if (!config?.id) {
-			return;
-		}
-
-		if (!config.group) {
-			config.group = 'menu';
-		}
-
-		if (config.condition) {
-			config.condition = mem(config.condition, { maxAge: 1000, cacheKey: JSON.stringify });
-		}
-
-		this.buttons[config.id] = config;
-	}
-
-	public removeButton(id: MessageActionConfig['id']): void {
-		delete this.buttons[id];
-	}
-
-	public async getAll(
-		props: MessageActionConditionProps,
-		context: MessageActionContext,
-		group: MessageActionGroup,
-	): Promise<MessageActionConfig[]> {
-		return (
-			await Promise.all(
-				Object.values(this.buttons)
-					.sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
-					.filter((button) => !button.group || (Array.isArray(button.group) ? button.group.includes(group) : button.group === group))
-					.filter((button) => !button.context || button.context.includes(context))
-					.map(async (button) => {
-						return [button, !button.condition || (await button.condition({ ...props, context }))] as const;
-					}),
-			)
-		)
-			.filter(([, condition]) => condition)
-			.map(([button]) => button);
-	}
-}
-
-const instance = new MessageAction();
-
-export { instance as MessageAction };