feat: Send multiple files into a single message

apps/meteor/app/file-upload/server/methods/sendFileMessage.ts

@@ -6,6 +6,7 @@ import type {
 	AtLeast,
 	FilesAndAttachments,
 	IMessage,
+	FileProp,
 } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Rooms, Uploads, Users } from '@rocket.chat/models';
@@ -15,7 +16,7 @@ import { Meteor } from 'meteor/meteor';
 import { callbacks } from '../../../../lib/callbacks';
 import { getFileExtension } from '../../../../lib/utils/getFileExtension';
 import { omit } from '../../../../lib/utils/omit';
-import { SystemLogger } from '../../../../server/lib/logger/system';
+// import { SystemLogger } from '../../../../server/lib/logger/system';
 import { canAccessRoomAsync } from '../../../authorization/server/functions/canAccessRoom';
 import { executeSendMessage } from '../../../lib/server/methods/sendMessage';
 import { FileUpload } from '../lib/FileUpload';
@@ -30,121 +31,127 @@ function validateFileRequiredFields(file: Partial<IUpload>): asserts file is AtL
 }
 
 export const parseFileIntoMessageAttachments = async (
-	file: Partial<IUpload>,
+	filearr: Partial<IUpload>[] | Partial<IUpload>,
 	roomId: string,
 	user: IUser,
 ): Promise<FilesAndAttachments> => {
-	validateFileRequiredFields(file);
-
-	await Uploads.updateFileComplete(file._id, user._id, omit(file, '_id'));
-
-	const fileUrl = FileUpload.getPath(`${file._id}/${encodeURI(file.name || '')}`);
-
 	const attachments: MessageAttachment[] = [];
-
-	const files = [
-		{
-			_id: file._id,
-			name: file.name || '',
-			type: file.type || 'file',
-			size: file.size || 0,
-			format: file.identify?.format || '',
-		},
-	];
-
-	if (/^image\/.+/.test(file.type as string)) {
-		const attachment: FileAttachmentProps = {
-			title: file.name,
-			type: 'file',
-			description: file?.description,
-			title_link: fileUrl,
-			title_link_download: true,
-			image_url: fileUrl,
-			image_type: file.type as string,
-			image_size: file.size,
-		};
-
-		if (file.identify?.size) {
-			attachment.image_dimensions = file.identify.size;
-		}
-
-		try {
-			attachment.image_preview = await FileUpload.resizeImagePreview(file);
-			const thumbResult = await FileUpload.createImageThumbnail(file);
-			if (thumbResult) {
-				const { data: thumbBuffer, width, height, thumbFileType, thumbFileName, originalFileId } = thumbResult;
-				const thumbnail = await FileUpload.uploadImageThumbnail(
-					{
-						thumbFileName,
-						thumbFileType,
-						originalFileId,
-					},
-					thumbBuffer,
-					roomId,
-					user._id,
-				);
-				const thumbUrl = FileUpload.getPath(`${thumbnail._id}/${encodeURI(file.name || '')}`);
-				attachment.image_url = thumbUrl;
-				attachment.image_type = thumbnail.type;
-				attachment.image_dimensions = {
-					width,
-					height,
-				};
-				files.push({
-					_id: thumbnail._id,
-					name: thumbnail.name || '',
-					type: thumbnail.type || 'file',
-					size: thumbnail.size || 0,
-					format: thumbnail.identify?.format || '',
-				});
+	const filesarray: FileProp[] = [];
+	if (!Array.isArray(filearr)) {
+		filearr = [filearr];
+	}
+	filearr.forEach(async (file: Partial<IUpload>) => {
+		validateFileRequiredFields(file);
+
+		await Uploads.updateFileComplete(file._id, user._id, omit(file, '_id'));
+
+		const fileUrl = FileUpload.getPath(`${file._id}/${encodeURI(file.name || '')}`);
+
+		const files = [
+			{
+				_id: file._id,
+				name: file.name || '',
+				type: file.type || 'file',
+				size: file.size || 0,
+				format: file.identify?.format || '',
+			},
+		];
+
+		if (/^image\/.+/.test(file.type as string)) {
+			const attachment: FileAttachmentProps = {
+				title: file.name,
+				type: 'file',
+				description: file?.description,
+				title_link: fileUrl,
+				title_link_download: true,
+				image_url: fileUrl,
+				image_type: file.type as string,
+				image_size: file.size,
+			};
+
+			if (file.identify?.size) {
+				attachment.image_dimensions = file.identify.size;
 			}
-		} catch (e) {
-			SystemLogger.error(e);
+
+			// try {
+			// 	attachment.image_preview = await FileUpload.resizeImagePreview(file);
+			// 	const thumbResult = await FileUpload.createImageThumbnail(file);
+			// 	if (thumbResult) {
+			// 		const { data: thumbBuffer, width, height, thumbFileType, thumbFileName, originalFileId } = thumbResult;
+			// 		const thumbnail = await FileUpload.uploadImageThumbnail(
+			// 			{
+			// 				thumbFileName,
+			// 				thumbFileType,
+			// 				originalFileId,
+			// 			},
+			// 			thumbBuffer,
+			// 			roomId,
+			// 			user._id,
+			// 		);
+			// 		const thumbUrl = FileUpload.getPath(`${thumbnail._id}/${encodeURI(file.name || '')}`);
+			// 		attachment.image_url = thumbUrl;
+			// 		attachment.image_type = thumbnail.type;
+			// 		attachment.image_dimensions = {
+			// 			width,
+			// 			height,
+			// 		};
+			// 		files.push({
+			// 			_id: thumbnail._id,
+			// 			name: thumbnail.name || '',
+			// 			type: thumbnail.type || 'file',
+			// 			size: thumbnail.size || 0,
+			// 			format: thumbnail.identify?.format || '',
+			// 		});
+			// 	}
+			// } catch (e) {
+			// 	SystemLogger.error(e);
+			// }
+			attachments.push(attachment);
+		} else if (/^audio\/.+/.test(file.type as string)) {
+			const attachment: FileAttachmentProps = {
+				title: file.name,
+				type: 'file',
+				description: file.description,
+				title_link: fileUrl,
+				title_link_download: true,
+				audio_url: fileUrl,
+				audio_type: file.type as string,
+				audio_size: file.size,
+			};
+			attachments.push(attachment);
+		} else if (/^video\/.+/.test(file.type as string)) {
+			const attachment: FileAttachmentProps = {
+				title: file.name,
+				type: 'file',
+				description: file.description,
+				title_link: fileUrl,
+				title_link_download: true,
+				video_url: fileUrl,
+				video_type: file.type as string,
+				video_size: file.size as number,
+			};
+			attachments.push(attachment);
+		} else {
+			const attachment = {
+				title: file.name,
+				type: 'file',
+				format: getFileExtension(file.name),
+				description: file.description,
+				title_link: fileUrl,
+				title_link_download: true,
+				size: file.size as number,
+			};
+			attachments.push(attachment);
 		}
-		attachments.push(attachment);
-	} else if (/^audio\/.+/.test(file.type as string)) {
-		const attachment: FileAttachmentProps = {
-			title: file.name,
-			type: 'file',
-			description: file.description,
-			title_link: fileUrl,
-			title_link_download: true,
-			audio_url: fileUrl,
-			audio_type: file.type as string,
-			audio_size: file.size,
-		};
-		attachments.push(attachment);
-	} else if (/^video\/.+/.test(file.type as string)) {
-		const attachment: FileAttachmentProps = {
-			title: file.name,
-			type: 'file',
-			description: file.description,
-			title_link: fileUrl,
-			title_link_download: true,
-			video_url: fileUrl,
-			video_type: file.type as string,
-			video_size: file.size as number,
-		};
-		attachments.push(attachment);
-	} else {
-		const attachment = {
-			title: file.name,
-			type: 'file',
-			format: getFileExtension(file.name),
-			description: file.description,
-			title_link: fileUrl,
-			title_link_download: true,
-			size: file.size as number,
-		};
-		attachments.push(attachment);
-	}
-	return { files, attachments };
+		filesarray.push(...files);
+	});
+	return { files: filesarray, attachments };
 };
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
-		sendFileMessage: (roomId: string, _store: string, file: Partial<IUpload>, msgData?: Record<string, any>) => boolean;
+		sendFileMessage: (roomId: string, _store: string, file: Partial<IUpload>[], msgData?: Record<string, any>) => boolean;
 	}
 }
 
@@ -156,7 +163,7 @@ export const sendFileMessage = async (
 		msgData,
 	}: {
 		roomId: string;
-		file: Partial<IUpload>;
+		file: Partial<IUpload>[] | Partial<IUpload>;
 		msgData?: Record<string, any>;
 	},
 	{
@@ -182,7 +189,6 @@ export const sendFileMessage = async (
 	if (user?.type !== 'app' && !(await canAccessRoomAsync(room, user))) {
 		return false;
 	}
-
 	check(
 		msgData,
 		Match.Maybe({
@@ -234,7 +240,6 @@ Meteor.methods<ServerMethods>({
 				method: 'sendFileMessage',
 			} as any);
 		}
-
 		return sendFileMessage(userId, { roomId, file, msgData });
 	},
 });

apps/meteor/app/lib/server/methods/sendMessage.ts

@@ -1,16 +1,19 @@
 import { api } from '@rocket.chat/core-services';
-import type { AtLeast, IMessage, IUser } from '@rocket.chat/core-typings';
+import type { AtLeast, IMessage, IUser, IUpload } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
-import { Messages, Users } from '@rocket.chat/models';
+import { Messages, Uploads, Users } from '@rocket.chat/models';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
 import { i18n } from '../../../../server/lib/i18n';
 import { SystemLogger } from '../../../../server/lib/logger/system';
+import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
+import { API } from '../../../api/server/api';
+import { sendFileMessage } from '../../../file-upload/server/methods/sendFileMessage';
+import { metrics } from '../../../metrics/server';
 import { canSendMessageAsync } from '../../../authorization/server/functions/canSendMessage';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
 import { MessageTypes } from '../../../ui-utils/server';
 import { sendMessage } from '../functions/sendMessage';
@@ -92,7 +95,7 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 			}
 		}
 
-		metrics.messagesSent.inc(); // TODO This line needs to be moved to it's proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736
+		metrics.messagesSent.inc(); // TODO This line needs to be moved to its proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736
 		return await sendMessage(user, message, room, false, previewUrls);
 	} catch (err: any) {
 		SystemLogger.error({ msg: 'Error sending message:', err });
@@ -114,12 +117,12 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
-		sendMessage(message: AtLeast<IMessage, '_id' | 'rid' | 'msg'>, previewUrls?: string[]): any;
+		sendMessage(message: AtLeast<IMessage, '_id' | 'rid' | 'msg'>, previewUrls?: string[], filesToConfirm?: string[], msgData?: any): any;
 	}
 }
 
 Meteor.methods<ServerMethods>({
-	async sendMessage(message, previewUrls) {
+	async sendMessage(message, previewUrls, filesToConfirm, msgData) {
 		check(message, Object);
 
 		const uid = Meteor.userId();
@@ -133,6 +136,34 @@ Meteor.methods<ServerMethods>({
 			throw new Error("Cannot send system messages using 'sendMessage'");
 		}
 
+		if (filesToConfirm !== undefined) {
+			if (!(await canAccessRoomIdAsync(message.rid, uid))) {
+				return API.v1.unauthorized();
+			}
+			const filesarray: Partial<IUpload>[] = await Promise.all(
+				filesToConfirm.map(async (fileid) => {
+					const file = await Uploads.findOneById(fileid);
+					if (!file) {
+						throw new Meteor.Error('invalid-file');
+					}
+					return file;
+				}),
+			);
+
+			await sendFileMessage(uid, { roomId: message.rid, file: filesarray, msgData }, { parseAttachmentsForE2EE: false });
+
+			await Promise.all(filesToConfirm.map((fileid) => Uploads.confirmTemporaryFile(fileid, uid)));
+
+			let resmessage;
+			if (filesarray[0] !== null && filesarray[0]._id !== undefined) {
+				resmessage = await Messages.getMessageByFileIdAndUsername(filesarray[0]._id, uid);
+			}
+
+			return API.v1.success({
+				resmessage,
+			});
+		}
+
 		try {
 			return await executeSendMessage(uid, message, previewUrls);
 		} catch (error: any) {
@@ -144,6 +175,7 @@ Meteor.methods<ServerMethods>({
 		}
 	},
 });
+
 // Limit a user, who does not have the "bot" role, to sending 5 msgs/second
 RateLimiter.limitMethod('sendMessage', 5, 1000, {
 	async userId(userId: IUser['_id']) {

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

@@ -101,10 +101,10 @@ export type UploadsAPI = {
 	wipeFailedOnes(): void;
 	cancel(id: Upload['id']): void;
 	send(
-		file: File,
+		file: File[] | File,
 		{ description, msg, t, e2e }: { description?: string; msg?: string; t?: IMessage['t']; e2e?: IMessage['e2e'] },
-		getContent?: (fileId: string, fileUrl: string) => Promise<IE2EEMessage['content']>,
-		fileContent?: { raw: Partial<IUpload>; encrypted: IE2EEMessage['content'] },
+		getContent?: (fileId: string[], fileUrl: string[]) => Promise<IE2EEMessage['content']>,
+		fileContent?: { raw: Partial<IUpload>; encrypted?: { algorithm: string; ciphertext: string } | undefined },
 	): Promise<void>;
 };