Merge branch 'develop' into fix-incorrect-cache-set

.changeset/funny-wolves-tie.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed issue where bad word filtering was not working in the UI for messages

.changeset/lucky-countries-look.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed the disappearance of some settings after navigation under network latency.

.changeset/thin-windows-reply.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue not displaying all groups in settings list

.changeset/violet-brooms-press.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)

.changeset/witty-bats-develop.md

@@ -0,0 +1,13 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/apps": patch
+"@rocket.chat/core-services": patch
+"@rocket.chat/core-typings": patch
+"@rocket.chat/fuselage-ui-kit": patch
+"@rocket.chat/rest-typings": patch
+"@rocket.chat/ddp-streamer": patch
+"@rocket.chat/presence": patch
+"rocketchat-services": patch
+---
+
+Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update.

apps/meteor/app/apps/server/converters/cachedFunction.ts

@@ -0,0 +1,17 @@
+export const cachedFunction = <F extends (...args: any[]) => any>(fn: F) => {
+	const cache = new Map<string, unknown>();
+
+	return ((...args) => {
+		const cacheKey = JSON.stringify(args);
+
+		if (cache.has(cacheKey)) {
+			return cache.get(cacheKey) as ReturnType<F>;
+		}
+
+		const result = fn(...args);
+
+		cache.set(cacheKey, result);
+
+		return result;
+	}) as F;
+};

apps/meteor/app/apps/server/converters/messages.js

@@ -1,9 +1,12 @@
 import { Messages, Rooms, Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 
+import { cachedFunction } from './cachedFunction';
 import { transformMappedData } from './transformMappedData';
 
 export class AppMessagesConverter {
+	mem = new WeakMap();
+
 	constructor(orch) {
 		this.orch = orch;
 	}
@@ -19,6 +22,15 @@ export class AppMessagesConverter {
 			return undefined;
 		}
 
+		const cache =
+			this.mem.get(msgObj) ??
+			new Map([
+				['room', cachedFunction(this.orch.getConverters().get('rooms').convertById.bind(this.orch.getConverters().get('rooms')))],
+				['user', cachedFunction(this.orch.getConverters().get('users').convertById.bind(this.orch.getConverters().get('users')))],
+			]);
+
+		this.mem.set(msgObj, cache);
+
 		const map = {
 			id: '_id',
 			threadId: 'tmid',
@@ -37,7 +49,7 @@ export class AppMessagesConverter {
 			token: 'token',
 			blocks: 'blocks',
 			room: async (message) => {
-				const result = await this.orch.getConverters().get('rooms').convertById(message.rid);
+				const result = await cache.get('room')(message.rid);
 				delete message.rid;
 				return result;
 			},
@@ -49,7 +61,7 @@ export class AppMessagesConverter {
 					return undefined;
 				}
 
-				return this.orch.getConverters().get('users').convertById(editedBy._id);
+				return cache.get('user')(editedBy._id);
 			},
 			attachments: async (message) => {
 				const result = await this._convertAttachmentsToApp(message.attachments);
@@ -61,7 +73,7 @@ export class AppMessagesConverter {
 					return undefined;
 				}
 
-				let user = await this.orch.getConverters().get('users').convertById(message.u._id);
+				let user = await cache.get('user')(message.u._id);
 
 				// When the sender of the message is a Guest (livechat) and not a user
 				if (!user) {

apps/meteor/app/apps/server/converters/threads.ts

@@ -5,6 +5,7 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { isEditedMessage, type IMessage } from '@rocket.chat/core-typings';
 import { Messages } from '@rocket.chat/models';
 
+import { cachedFunction } from './cachedFunction';
 import { transformMappedData } from './transformMappedData';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -18,24 +19,6 @@ interface Orchestrator {
 	};
 }
 
-const cachedFunction = <F extends (...args: any[]) => any>(fn: F) => {
-	const cache = new Map<string, unknown>();
-
-	return ((...args) => {
-		const cacheKey = JSON.stringify(args);
-
-		if (cache.has(cacheKey)) {
-			return cache.get(cacheKey) as ReturnType<F>;
-		}
-
-		const result = fn(...args);
-
-		cache.set(cacheKey, result);
-
-		return result;
-	}) as F;
-};
-
 export class AppThreadsConverter implements IAppThreadsConverter {
 	constructor(
 		private readonly orch: {

apps/meteor/app/discussion/client/index.ts

@@ -1,3 +1,2 @@
 // Other UI extensions
-import './lib/messageTypes/discussionMessage';
 import './createDiscussionMessageAction';

apps/meteor/app/e2e/client/rocketchat.e2e.ts

@@ -272,7 +272,7 @@ class E2E extends Emitter {
 		delete this.instancesByRoomId[rid];
 	}
 
-	async persistKeys(
+	private async persistKeys(
 		{ public_key, private_key }: KeyPair,
 		password: string,
 		{ force }: { force: boolean } = { force: false },

apps/meteor/app/settings/server/SettingsRegistry.ts

@@ -140,7 +140,6 @@ export class SettingsRegistry {
 		const settingFromCodeOverwritten = overwriteSetting(settingFromCode);
 
 		const settingStored = this.store.getSetting(_id);
-
 		const settingStoredOverwritten = settingStored && overwriteSetting(settingStored);
 
 		try {

apps/meteor/app/ui-utils/lib/MessageTypes.ts

@@ -5,8 +5,6 @@ export type MessageType = {
 	id: MessageTypesValues;
 	system?: boolean;
 	/* deprecated */
-	render?: (message: IMessage) => string;
-	/* deprecated */
 	template?: (message: IMessage) => unknown;
 	message: TranslationKey;
 	data?: (message: IMessage) => Record<string, string>;

apps/meteor/app/ui-utils/server/Message.ts

@@ -11,9 +11,6 @@ export const Message = {
 	parse(msg: IMessage, language: string) {
 		const messageType = MessageTypes.getType(msg);
 		if (messageType) {
-			if (messageType.render) {
-				return messageType.render(msg);
-			}
 			if (messageType.template) {
 				// Render message
 				return;

apps/meteor/client/components/Page/PageScrollableContent.tsx

@@ -1,4 +1,3 @@
-import { css } from '@rocket.chat/css-in-js';
 import type { Scrollable } from '@rocket.chat/fuselage';
 import { Box } from '@rocket.chat/fuselage';
 import type { ComponentProps } from 'react';
@@ -26,17 +25,7 @@ const PageScrollableContent = forwardRef<HTMLElement, PageScrollableContentProps
 			borderBlockEndColor={borderBlockEndColor}
 		>
 			<CustomScrollbars onScroll={onScrollContent as CustomScrollbarsProps['onScroll']} ref={ref}>
-				<Box
-					className={css`
-						transform: translateZ(0);
-					`}
-					height='100%'
-					paddingBlock={16}
-					paddingInline={24}
-					display='flex'
-					flexDirection='column'
-					{...props}
-				/>
+				<Box paddingBlock={16} paddingInline={24} display='flex' flexDirection='column' {...props} />
 			</CustomScrollbars>
 		</Box>
 	);

apps/meteor/client/components/message/variants/SystemMessage.tsx

@@ -94,14 +94,9 @@ const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps
 						)}
 					</MessageNameContainer>
 					{messageType && (
-						<MessageSystemBody
-							data-qa-type='system-message-body'
-							dangerouslySetInnerHTML={{
-								__html: messageType.render
-									? messageType.render(message)
-									: t(messageType.message, messageType.data ? messageType.data(message) : {}),
-							}}
-						/>
+						<MessageSystemBody data-qa-type='system-message-body'>
+							{t(messageType.message, messageType.data ? messageType.data(message) : {})}
+						</MessageSystemBody>
 					)}
 					<MessageSystemTimestamp title={formatDateAndTime(message.ts)}>{formatTime(message.ts)}</MessageSystemTimestamp>
 				</MessageSystemBlock>

apps/meteor/client/lib/settings/PrivateSettingsCachedCollection.ts

@@ -14,7 +14,7 @@ class PrivateSettingsCachedCollection extends CachedCollection<ISetting> {
 	async setupListener(): Promise<void> {
 		sdk.stream('notify-logged', [this.eventName as 'private-settings-changed'], async (t: string, { _id, ...record }: { _id: string }) => {
 			this.log('record received', t, { _id, ...record });
-			this.collection.upsert({ _id }, record);
+			this.collection.update({ _id }, { $set: record }, { upsert: true });
 			this.sync();
 		});
 	}

apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx

@@ -1,51 +1,55 @@
-import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
+import { createPortal } from 'react-dom';
 
 const CodeMirrorBox = ({ label, children }: { label: ReactNode; children: ReactElement }) => {
 	const t = useTranslation();
 	const [fullScreen, toggleFullScreen] = useToggle(false);
 
-	const fullScreenStyle = css`
-		position: fixed;
-		z-index: 100;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-
-		display: flex;
-
-		flex-direction: column;
-
-		width: auto;
-		height: auto;
-
-		padding: 40px;
-
-		align-items: stretch;
-	`;
-
-	return (
-		<Box
-			backgroundColor='light'
-			className={['code-mirror-box', fullScreen && 'code-mirror-box-fullscreen', fullScreen && fullScreenStyle].filter(Boolean)}
-		>
-			{fullScreen && (
+	if (fullScreen) {
+		return createPortal(
+			<Box
+				className='code-mirror-box code-mirror-box-fullscreen'
+				color='default'
+				backgroundColor='light'
+				position='absolute'
+				zIndex={100}
+				display='flex'
+				flexDirection='column'
+				width='100%'
+				height='100%'
+				p={40}
+			>
 				<Box fontScale='p1' mbe={4}>
 					{label}
 				</Box>
-			)}
+				<Box display='flex' flexDirection='column' height='100%' role='code' aria-label={typeof label === 'string' ? label : undefined}>
+					{children}
+				</Box>
+				<Box mbs={8}>
+					<ButtonGroup>
+						<Button primary onClick={(): void => toggleFullScreen()}>
+							{t('Exit_Full_Screen')}
+						</Button>
+					</ButtonGroup>
+				</Box>
+			</Box>,
+			document.getElementById('main-content') as HTMLElement,
+		);
+	}
+
+	return (
+		<Box className='code-mirror-box'>
 			<Box display='flex' flexDirection='column' height='100%' role='code' aria-label={typeof label === 'string' ? label : undefined}>
 				{children}
 			</Box>
 			<Box mbs={8}>
 				<ButtonGroup>
 					<Button primary onClick={(): void => toggleFullScreen()}>
-						{fullScreen ? t('Exit_Full_Screen') : t('Full_Screen')}
+						{t('Full_Screen')}
 					</Button>
 				</ButtonGroup>
 			</Box>

apps/meteor/ee/server/apps/communication/rest.ts

@@ -747,7 +747,12 @@ export class AppsRestApi {
 						return API.v1.internalError('private_app_install_disabled');
 					}
 
-					const aff = await manager.update(buff, permissionsGranted);
+					const user = orchestrator
+						?.getConverters()
+						?.get('users')
+						?.convertToApp(await Meteor.userAsync());
+
+					const aff = await manager.update(buff, permissionsGranted, { user, loadApp: true });
 					const info: IAppInfo & { status?: AppStatus } = aff.getAppInfo();
 
 					if (aff.hasStorageError()) {

apps/meteor/server/services/messages/service.ts

@@ -142,8 +142,8 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 
 		message = await mentionServer.execute(message);
 		message = await this.cannedResponse.replacePlaceholders({ message, room, user });
-		message = await this.markdownParser.parseMarkdown({ message, config: this.getMarkdownConfig() });
 		message = await this.badWords.filterBadWords({ message });
+		message = await this.markdownParser.parseMarkdown({ message, config: this.getMarkdownConfig() });
 		message = await this.spotify.convertSpotifyLinks({ message });
 		message = await this.jumpToMessage.createAttachmentForMessageURLs({
 			message,

apps/meteor/tests/e2e/image-gallery.spec.ts

@@ -31,6 +31,7 @@ test.describe.serial('Image Gallery', async () => {
 	});
 
 	test.afterAll(async ({ api }) => {
+		await poHomeChannel.page.close();
 		await deleteChannel(api, targetChannel);
 		await deleteChannel(api, targetChannelLargeImage);
 	});