regression: Convert emoji shortname to unicode on notification emails (…

…#31521)
RocketChat · Jan 23, 2024 · c153fbf · c153fbf
1 parent 448e35a
commit c153fbf
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.js b/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -148,9 +148,11 @@ export const sendNotification = async ({
 	) {
 		const messageWithUnicode = message.msg ? emojione.shortnameToUnicode(message.msg) : message.msg;
 		const firstAttachment = message.attachments?.length > 0 && message.attachments.shift();
-		firstAttachment.description =
-			typeof firstAttachment.description === 'string' ? emojione.shortnameToUnicode(firstAttachment.description) : undefined;
-		firstAttachment.text = typeof firstAttachment.text === 'string' ? emojione.shortnameToUnicode(firstAttachment.text) : undefined;
+		if (firstAttachment) {
+			firstAttachment.description =
+				typeof firstAttachment.description === 'string' ? emojione.shortnameToUnicode(firstAttachment.description) : undefined;
+			firstAttachment.text = typeof firstAttachment.text === 'string' ? emojione.shortnameToUnicode(firstAttachment.text) : undefined;
+		}
 
 		const attachments = firstAttachment ? [firstAttachment, ...message.attachments].filter(Boolean) : [];
 		for await (const email of receiver.emails) {