refactor: Remove unused description from attachments render (RocketChat#40067)

Author: dougfabris

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

@@ -70,16 +70,6 @@ export const AutoTranslate = {
 					}
 				}
 
-				if (attachment.description && attachment.translations && attachment.translations[language]) {
-					attachment.translations.original = attachment.description;
-
-					if (autoTranslateShowInverse) {
-						attachment.description = attachment.translations.original;
-					} else {
-						attachment.description = attachment.translations[language];
-					}
-				}
-
 				// @ts-expect-error - not sure what to do with this
 				if (attachment.attachments && attachment.attachments.length > 0) {
 					// @ts-expect-error - not sure what to do with this

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

@@ -320,7 +320,7 @@ export abstract class AutoTranslate {
 		if (message.attachments && message.attachments.length > 0) {
 			setImmediate(async () => {
 				for (const [index, attachment] of message.attachments?.entries() ?? []) {
-					if (attachment.description || attachment.text) {
+					if (attachment.text) {
 						// Removes the initial link `[ ](quoterl)` from quote message before translation
 						const translatedText = attachment?.text?.replace(/\[(.*?)\]\(.*?\)/g, '$1') || attachment?.text;
 						const attachmentMessage = { ...attachment, text: translatedText };

apps/meteor/app/autotranslate/server/deeplTranslate.ts

@@ -196,7 +196,7 @@ class DeeplAutoTranslate extends AutoTranslate {
 					params: {
 						auth_key: this.apiKey,
 						target_lang: language,
-						text: attachment.description || attachment.text || '',
+						text: attachment.text || '',
 					},
 				});
 				if (!result.ok) {

apps/meteor/app/autotranslate/server/googleTranslate.ts

@@ -195,7 +195,7 @@ class GoogleAutoTranslate extends AutoTranslate {
 						key: this.apiKey,
 						target: language,
 						format: 'text',
-						q: attachment.description || attachment.text || '',
+						q: attachment.text || '',
 					},
 				});
 				if (!result.ok) {

apps/meteor/app/autotranslate/server/msTranslate.ts

@@ -192,7 +192,7 @@ class MsAutoTranslate extends AutoTranslate {
 			return this._translate(
 				[
 					{
-						Text: attachment.description || attachment.text || '',
+						Text: attachment.text || '',
 					},
 				],
 				targetLanguages,

apps/meteor/app/lib/server/functions/notifications/email.js

@@ -77,13 +77,8 @@ export async function getEmailContent({ message, user, room }) {
 	}
 
 	if (hasFiles) {
-		const attachments = message.attachments || [];
-		const fileParts = files.map((file, index) => {
-			let part = escapeHTML(file.name);
-			if (attachments[index]?.description) {
-				part += `<br/><br/>${escapeHTML(attachments[index].description)}`;
-			}
-			return part;
+		const fileParts = files.map((file) => {
+			return escapeHTML(file.name);
 		});
 		contentParts.push(fileParts.join('<br/><br/>'));
 	}

apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts

@@ -195,8 +195,6 @@ export const sendNotification = async ({
 		const firstAttachment = message.attachments?.length && message.attachments.shift();
 
 		if (firstAttachment) {
-			firstAttachment.description =
-				typeof firstAttachment.description === 'string' ? emojione.shortnameToUnicode(firstAttachment.description) : undefined;
 			firstAttachment.text = typeof firstAttachment.text === 'string' ? emojione.shortnameToUnicode(firstAttachment.text) : undefined;
 		}
 

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

@@ -34,7 +34,7 @@ export async function executeUpdateMessage(
 	// IF the message has custom fields, always update
 	// Ideally, we'll compare the custom fields to check for change, but since we don't know the shape of
 	// custom fields, as it's user defined, we're gonna update
-	const msgText = originalMessage?.attachments?.[0]?.description ?? originalMessage.msg;
+	const msgText = originalMessage.msg;
 	if (msgText === message.msg && !previewUrls && !message.customFields) {
 		return;
 	}
@@ -86,13 +86,6 @@ export async function executeUpdateMessage(
 	}
 	await canSendMessageAsync(message.rid, { uid: user._id, username: user.username ?? undefined, ...user });
 
-	// It is possible to have an empty array as the attachments property, so ensure both things exist
-	if (originalMessage.attachments && originalMessage.attachments.length > 0 && originalMessage.attachments[0].description !== undefined) {
-		originalMessage.attachments[0].description = message.msg;
-		message.attachments = originalMessage.attachments;
-		message.msg = originalMessage.msg;
-	}
-
 	message.u = originalMessage.u;
 
 	return updateMessage(message, user, originalMessage, previewUrls);

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

@@ -108,17 +108,14 @@ export async function sendTranscript({
 
 		const messageType = MessageTypes.getType(message);
 
-		let messageContent = messageType?.system
+		const messageContent = messageType?.system
 			? DOMPurify.sanitize(`
 				<i>${messageType.text(i18n.cloneInstance({ interpolation: { escapeValue: false } }).t, message)}}</i>`)
 			: escapeHtml(message.msg);
 
 		let filesHTML = '';
 
 		if (message.attachments && message.attachments?.length > 0) {
-			messageContent = message.attachments[0].description || '';
-			escapeHtml(messageContent);
-
 			for await (const attachment of message.attachments) {
 				if (!isFileAttachment(attachment)) {
 					continue;

apps/meteor/app/slackbridge/server/RocketAdapter.ts

@@ -203,14 +203,11 @@ export default class RocketAdapter {
 
 		if (rocketMessage.file.name) {
 			let fileName = rocketMessage.file.name;
-			let text = rocketMessage.msg;
+			const text = rocketMessage.msg;
 
 			const attachment = this.getMessageAttachment(rocketMessage);
 			if (attachment) {
 				fileName = Meteor.absoluteUrl(attachment.title_link);
-				if (!text) {
-					text = attachment.description;
-				}
 			}
 
 			await slack.postMessage(slack.getSlackChannel(rocketMessage.rid), { ...rocketMessage, msg: `${text} ${fileName}` });