Merge branch 'develop' into more-tests-for-groups-kick

.changeset/cool-zoos-move.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed threads breaking when sending messages too fast

.changeset/eleven-gorillas-deliver.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix trying to upload same file again and again.

.changeset/lucky-vans-develop.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with file attachments in rooms' messages export having no content

.changeset/popular-actors-cheat.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Do not allow auto-translation to be enabled in E2E rooms

.changeset/wicked-jars-double.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Handle the username update in the background

apps/meteor/app/autotranslate/server/methods/saveSettings.ts

@@ -1,4 +1,4 @@
-import { Subscriptions } from '@rocket.chat/models';
+import { Subscriptions, Rooms } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -46,6 +46,13 @@ Meteor.methods<ServerMethods>({
 
 		switch (field) {
 			case 'autoTranslate':
+				const room = await Rooms.findE2ERoomById(rid, { projection: { _id: 1 } });
+				if (room && value === '1') {
+					throw new Meteor.Error('error-e2e-enabled', 'Enabling auto-translation in E2E encrypted rooms is not allowed', {
+						method: 'saveAutoTranslateSettings',
+					});
+				}
+
 				await Subscriptions.updateAutoTranslateById(subscription._id, value === '1');
 				if (!subscription.autoTranslateLanguage && options.defaultLanguage) {
 					await Subscriptions.updateAutoTranslateLanguageById(subscription._id, options.defaultLanguage);

apps/meteor/app/channel-settings/server/functions/saveRoomEncrypted.ts

@@ -1,7 +1,7 @@
 import { Message } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
 import { isRegisterUser } from '@rocket.chat/core-typings';
-import { Rooms } from '@rocket.chat/models';
+import { Rooms, Subscriptions } from '@rocket.chat/models';
 import { Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import type { UpdateResult } from 'mongodb';
@@ -25,5 +25,9 @@ export const saveRoomEncrypted = async function (rid: string, encrypted: boolean
 
 		await Message.saveSystemMessage(type, rid, user.username, user);
 	}
+
+	if (encrypted) {
+		await Subscriptions.disableAutoTranslateByRoomId(rid);
+	}
 	return update;
 };

apps/meteor/app/file-upload/server/config/AmazonS3.ts

@@ -32,12 +32,15 @@ const get: FileUploadClass['get'] = async function (this: FileUploadClass, file,
 
 const copy: FileUploadClass['copy'] = async function (this: FileUploadClass, file, out) {
 	const fileUrl = await this.store.getRedirectURL(file);
-	if (fileUrl) {
-		const request = /^https:/.test(fileUrl) ? https : http;
-		request.get(fileUrl, (fileRes) => fileRes.pipe(out));
-	} else {
+	if (!fileUrl) {
 		out.end();
+		return;
 	}
+
+	const request = /^https:/.test(fileUrl) ? https : http;
+	return new Promise((resolve) => {
+		request.get(fileUrl, (fileRes) => fileRes.pipe(out).on('finish', () => resolve()));
+	});
 };
 
 const AmazonS3Uploads = new FileUploadClass({

apps/meteor/app/file-upload/server/config/GoogleStorage.ts

@@ -32,12 +32,15 @@ const get: FileUploadClass['get'] = async function (this: FileUploadClass, file,
 const copy: FileUploadClass['copy'] = async function (this: FileUploadClass, file, out) {
 	const fileUrl = await this.store.getRedirectURL(file, false);
 
-	if (fileUrl) {
-		const request = /^https:/.test(fileUrl) ? https : http;
-		request.get(fileUrl, (fileRes) => fileRes.pipe(out));
-	} else {
+	if (!fileUrl) {
 		out.end();
+		return;
 	}
+
+	const request = /^https:/.test(fileUrl) ? https : http;
+	return new Promise((resolve) => {
+		request.get(fileUrl, (fileRes) => fileRes.pipe(out).on('finish', () => resolve()));
+	});
 };
 
 const GoogleCloudStorageUploads = new FileUploadClass({

apps/meteor/app/file-upload/server/config/Webdav.ts

@@ -19,7 +19,9 @@ const get: FileUploadClass['get'] = async function (this: FileUploadClass, file,
 };
 
 const copy: FileUploadClass['copy'] = async function (this: FileUploadClass, file, out) {
-	(await this.store.getReadStream(file._id, file)).pipe(out);
+	return new Promise(async (resolve) => {
+		(await this.store.getReadStream(file._id, file)).pipe(out).on('finish', () => resolve());
+	});
 };
 
 const WebdavUploads = new FileUploadClass({

apps/meteor/app/lib/server/functions/saveUser.js

@@ -366,6 +366,7 @@ export const saveUser = async function (userId, userData) {
 				_id: userData._id,
 				username: userData.username,
 				name: userData.name,
+				updateUsernameInBackground: true,
 			}))
 		) {
 			throw new Meteor.Error('error-could-not-save-identity', 'Could not save user identity', {

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

@@ -1,5 +1,7 @@
+import type { IUser } from '@rocket.chat/core-typings';
 import { Messages, VideoConference, LivechatDepartmentAgents, Rooms, Subscriptions, Users } from '@rocket.chat/models';
 
+import { SystemLogger } from '../../../../server/lib/logger/system';
 import { FileUpload } from '../../../file-upload/server';
 import { _setRealName } from './setRealName';
 import { _setUsername } from './setUsername';
@@ -11,7 +13,17 @@ import { validateName } from './validateName';
  * @param {object} changes changes to the user
  */
 
-export async function saveUserIdentity({ _id, name: rawName, username: rawUsername }: { _id: string; name?: string; username?: string }) {
+export async function saveUserIdentity({
+	_id,
+	name: rawName,
+	username: rawUsername,
+	updateUsernameInBackground = false,
+}: {
+	_id: string;
+	name?: string;
+	username?: string;
+	updateUsernameInBackground?: boolean; // TODO: remove this
+}) {
 	if (!_id) {
 		return false;
 	}
@@ -48,46 +60,91 @@ export async function saveUserIdentity({ _id, name: rawName, username: rawUserna
 
 	// if coming from old username, update all references
 	if (previousUsername) {
-		if (usernameChanged && typeof rawUsername !== 'undefined') {
-			const fileStore = FileUpload.getStore('Avatars');
-			const previousFile = await fileStore.model.findOneByName(previousUsername);
-			const file = await fileStore.model.findOneByName(username);
-			if (file) {
-				await fileStore.model.deleteFile(file._id);
-			}
-			if (previousFile) {
-				await fileStore.model.updateFileNameById(previousFile._id, username);
-			}
-
-			await Messages.updateAllUsernamesByUserId(user._id, username);
-			await Messages.updateUsernameOfEditByUserId(user._id, username);
-
-			const cursor = Messages.findByMention(previousUsername);
-			for await (const msg of cursor) {
-				const updatedMsg = msg.msg.replace(new RegExp(`@${previousUsername}`, 'ig'), `@${username}`);
-				await Messages.updateUsernameAndMessageOfMentionByIdAndOldUsername(msg._id, previousUsername, username, updatedMsg);
-			}
-
-			await Rooms.replaceUsername(previousUsername, username);
-			await Rooms.replaceMutedUsername(previousUsername, username);
-			await Rooms.replaceUsernameOfUserByUserId(user._id, username);
-			await Subscriptions.setUserUsernameByUserId(user._id, username);
-
-			await LivechatDepartmentAgents.replaceUsernameOfAgentByUserId(user._id, username);
+		const handleUpdateParams = {
+			username,
+			previousUsername,
+			rawUsername,
+			usernameChanged,
+			user,
+			name,
+			previousName,
+			rawName,
+			nameChanged,
+		};
+		if (updateUsernameInBackground) {
+			setImmediate(async () => {
+				try {
+					await updateUsernameReferences(handleUpdateParams);
+				} catch (err) {
+					SystemLogger.error(err);
+				}
+			});
+		} else {
+			await updateUsernameReferences(handleUpdateParams);
 		}
+	}
+
+	return true;
+}
 
-		// update other references if either the name or username has changed
-		if (usernameChanged || nameChanged) {
-			// update name and fname of 1-on-1 direct messages
-			await Subscriptions.updateDirectNameAndFnameByName(previousUsername, rawUsername && username, rawName && name);
+async function updateUsernameReferences({
+	username,
+	previousUsername,
+	rawUsername,
+	usernameChanged,
+	user,
+	name,
+	previousName,
+	rawName,
+	nameChanged,
+}: {
+	username: string;
+	previousUsername: string;
+	rawUsername?: string;
+	usernameChanged: boolean;
+	user: IUser;
+	name: string;
+	previousName: string | undefined;
+	rawName?: string;
+	nameChanged: boolean;
+}): Promise<void> {
+	if (usernameChanged && typeof rawUsername !== 'undefined') {
+		const fileStore = FileUpload.getStore('Avatars');
+		const previousFile = await fileStore.model.findOneByName(previousUsername);
+		const file = await fileStore.model.findOneByName(username);
+		if (file) {
+			await fileStore.model.deleteFile(file._id);
+		}
+		if (previousFile) {
+			await fileStore.model.updateFileNameById(previousFile._id, username);
+		}
 
-			// update name and fname of group direct messages
-			await updateGroupDMsName(user);
+		await Messages.updateAllUsernamesByUserId(user._id, username);
+		await Messages.updateUsernameOfEditByUserId(user._id, username);
 
-			// update name and username of users on video conferences
-			await VideoConference.updateUserReferences(user._id, username || previousUsername, name || previousName);
+		const cursor = Messages.findByMention(previousUsername);
+		for await (const msg of cursor) {
+			const updatedMsg = msg.msg.replace(new RegExp(`@${previousUsername}`, 'ig'), `@${username}`);
+			await Messages.updateUsernameAndMessageOfMentionByIdAndOldUsername(msg._id, previousUsername, username, updatedMsg);
 		}
+
+		await Rooms.replaceUsername(previousUsername, username);
+		await Rooms.replaceMutedUsername(previousUsername, username);
+		await Rooms.replaceUsernameOfUserByUserId(user._id, username);
+		await Subscriptions.setUserUsernameByUserId(user._id, username);
+
+		await LivechatDepartmentAgents.replaceUsernameOfAgentByUserId(user._id, username);
 	}
 
-	return true;
+	// update other references if either the name or username has changed
+	if (usernameChanged || nameChanged) {
+		// update name and fname of 1-on-1 direct messages
+		await Subscriptions.updateDirectNameAndFnameByName(previousUsername, rawUsername && username, rawName && name);
+
+		// update name and fname of group direct messages
+		await updateGroupDMsName(user);
+
+		// update name and username of users on video conferences
+		await VideoConference.updateUserReferences(user._id, username || previousUsername, name || previousName);
+	}
 }

apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts

@@ -5,13 +5,15 @@ import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { e2e } from '../../../app/e2e/client/rocketchat.e2e';
-import { useRoom } from '../../views/room/contexts/RoomContext';
+import { dispatchToastMessage } from '../../lib/toast';
+import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
 import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
 import { useReactiveValue } from '../useReactiveValue';
 
 export const useE2EERoomAction = () => {
 	const enabled = useSetting('E2E_Enable', false);
 	const room = useRoom();
+	const subscription = useRoomSubscription();
 	const readyToEncrypt = useReactiveValue(useCallback(() => e2e.isReady(), [])) || room.encrypted;
 	const permittedToToggleEncryption = usePermission('toggle-room-e2e-encryption', room._id);
 	const permittedToEditRoom = usePermission('edit-room', room._id);
@@ -21,8 +23,22 @@ export const useE2EERoomAction = () => {
 
 	const toggleE2E = useEndpoint('POST', '/v1/rooms.saveRoomSettings');
 
-	const action = useMutableCallback(() => {
-		void toggleE2E({ rid: room._id, encrypted: !room.encrypted });
+	const action = useMutableCallback(async () => {
+		const { success } = await toggleE2E({ rid: room._id, encrypted: !room.encrypted });
+		if (!success) {
+			return;
+		}
+
+		dispatchToastMessage({
+			type: 'success',
+			message: room.encrypted
+				? t('E2E_Encryption_disabled_for_room', { roomName: room.name })
+				: t('E2E_Encryption_enabled_for_room', { roomName: room.name }),
+		});
+
+		if (subscription?.autoTranslate) {
+			dispatchToastMessage({ type: 'success', message: t('AutoTranslate_Disabled_for_room', { roomName: room.name }) });
+		}
 	});
 
 	const enabledOnRoom = !!room.encrypted;

apps/meteor/client/lib/chats/ChatAPI.ts

@@ -144,7 +144,7 @@ export type ChatAPI = {
 	ActionManager: any;
 
 	readonly flows: {
-		readonly uploadFiles: (files: readonly File[]) => Promise<void>;
+		readonly uploadFiles: (files: readonly File[], resetFileInput?: () => void) => Promise<void>;
 		readonly sendMessage: ({ text, tshow }: { text: string; tshow?: boolean; previewUrls?: string[] }) => Promise<boolean>;
 		readonly processSlashCommand: (message: IMessage, userId: string | null) => Promise<boolean>;
 		readonly processTooLongMessage: (message: IMessage) => Promise<boolean>;

apps/meteor/client/lib/chats/flows/uploadFiles.ts

@@ -6,7 +6,7 @@ import { imperativeModal } from '../../imperativeModal';
 import { prependReplies } from '../../utils/prependReplies';
 import type { ChatAPI } from '../ChatAPI';
 
-export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promise<void> => {
+export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFileInput?: () => void): Promise<void> => {
 	const replies = chat.composer?.quotedMessages.get() ?? [];
 
 	const msg = await prependReplies('', replies);
@@ -52,4 +52,5 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promis
 	};
 
 	uploadNextFile();
+	resetFileInput?.();
 };

apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx

@@ -1,4 +1,4 @@
-import { Box, Icon, Skeleton } from '@rocket.chat/fuselage';
+import { Box, Icon, Skeleton, Scrollable } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -10,8 +10,8 @@ const AnalyticsReports = () => {
 	const { data, isLoading, isSuccess, isError } = useAnalyticsObject();
 
 	return (
-		<>
-			<Box p={20} pbe={28} mbe={24}>
+		<Box display='flex' flexDirection='column' overflow='hidden' height='100%'>
+			<Box backgroundColor='light' p={20} pbe={28} mbe={16} borderRadius={4}>
 				<Box display='flex' flexDirection='row' alignItems='center' mbe={20}>
 					<Box display='flex' justifyContent='center' alignItems='center' borderRadius={2} p={4} mie={8} bg='status-background-info'>
 						<Icon name='info' size={20} color='info' />
@@ -23,18 +23,15 @@ const AnalyticsReports = () => {
 				</Box>
 				<Box fontScale='p1'>{t('Analytics_page_briefing_second_paragraph')}</Box>
 			</Box>
-			<Box display='flex' flexDirection='column' padding={8} flexGrow={1} color='default' bg='neutral' borderRadius={4} overflow='scroll'>
-				{isSuccess && <pre>{JSON.stringify(data, null, '\t')}</pre>}
-				{isError && t('Something_went_wrong_try_again_later')}
-				{isLoading && (
-					<>
-						<Skeleton />
-						<Skeleton />
-						<Skeleton />
-					</>
-				)}
-			</Box>
-		</>
+			<Scrollable vertical>
+				<Box mbe={8} padding={8} bg='neutral' borderRadius={4} height='100%'>
+					{isSuccess && <pre>{JSON.stringify(data, null, '\t')}</pre>}
+					{isError && t('Something_went_wrong_try_again_later')}
+					{isLoading && Array.from({ length: 10 }).map((_, index) => <Skeleton key={index} />)}
+					<></>
+				</Box>
+			</Scrollable>
+		</Box>
 	);
 };