fix: Handle encrypted pinned messages

.changeset/forty-bikes-check.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/core-typings': patch
+'@rocket.chat/meteor': patch
+---
+
+Decrypt pinned encrypted message

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

@@ -1,7 +1,7 @@
 import QueryString from 'querystring';
 import URL from 'url';
 
-import type { IE2EEMessage, IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { IE2EEMessage, IMessage, IRoom, ISubscription, MessageAttachment } from '@rocket.chat/core-typings';
 import { isE2EEMessage, isFileAttachment } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import EJSON from 'ejson';
@@ -437,10 +437,34 @@
 		return decryptedMessageWithAttachments;
 	}
 
+	async decryptPinnedMessage(message: IMessage) {
+		if (!message?.attachments || !message.attachments[0]?.text) {
+			return message;
+		}
+
+		const e2eRoom = await this.getInstanceByRoomId(message.rid);
+		const pinnedMessage = message.attachments[0]?.text;
+
+		if (!e2eRoom || !pinnedMessage) {
+			return message;
+		}
+
+		const data = await e2eRoom.decrypt(pinnedMessage);
+
+		if (!data) {
+			return message;
+		}
+
+		const decryptedPinnedMessage = { ...message } as IMessage & { attachments: MessageAttachment[] };
+		decryptedPinnedMessage.attachments[0].text = data.text;
+
+		return decryptedPinnedMessage;
+	}
+
 	async decryptMessageAttachments(message: IMessage): Promise<IMessage> {
 		const { attachments } = message;
 
 		if (!attachments || !attachments.length) {
 			return message;
 		}
 

apps/meteor/app/message-pin/server/pinMessage.ts

@@ -131,7 +131,9 @@ Meteor.methods<ServerMethods>({
 		// App IPostMessagePinned event hook
 		await Apps.self?.triggerEvent(AppEvents.IPostMessagePinned, originalMessage, await Meteor.userAsync(), originalMessage.pinned);
 
-		const msgId = await Message.saveSystemMessage('message_pinned', originalMessage.rid, '', me, {
+		const pinMessageType = originalMessage.t === 'e2e' ? 'message_pinned_e2e' : 'message_pinned';
+
+		const msgId = await Message.saveSystemMessage(pinMessageType, originalMessage.rid, '', me, {
 			attachments: [
 				{
 					text: originalMessage.msg,

apps/meteor/client/components/message/StatusIndicators.tsx

@@ -17,7 +17,7 @@ const StatusIndicators = ({ message }: StatusIndicatorsProps): ReactElement => {
 	const starred = useShowStarred({ message });
 	const following = useShowFollowing({ message });
 
-	const isEncryptedMessage = isE2EEMessage(message);
+	const isEncryptedMessage = isE2EEMessage(message) || message.t === 'message_pinned_e2e';
 	const isOtrMessage = isOTRMessage(message) || isOTRAckMessage(message);
 
 	const uid = useUserId();

apps/meteor/client/startup/e2e.ts

@@ -118,6 +118,11 @@ Meteor.startup(() => {
 			if (!e2eRoom?.shouldConvertReceivedMessages()) {
 				return msg;
 			}
+
+			if (msg.t === 'message_pinned_e2e') {
+				return e2e.decryptPinnedMessage(msg);
+			}
+
 			return e2e.decryptMessage(msg);
 		});
 

apps/meteor/client/startup/messageTypes.ts

@@ -61,4 +61,10 @@ Meteor.startup(() => {
 		system: true,
 		message: 'Pinned_a_message',
 	});
+
+	MessageTypes.registerType({
+		id: 'message_pinned_e2e',
+		system: true,
+		message: 'Pinned_a_message',
+	});
 });

apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx

@@ -4,6 +4,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
+import { onClientMessageReceived } from '../../../lib/onClientMessageReceived';
 import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi';
 import { useRoom } from '../contexts/RoomContext';
 import MessageListTab from './MessageListTab';
@@ -25,7 +26,7 @@ const PinnedMessagesTab = (): ReactElement => {
 			messages.push(...result.messages.map(mapMessageFromApi));
 		}
 
-		return messages;
+		return Promise.all(messages.map(onClientMessageReceived));
 	});
 
 	const t = useTranslation();

packages/core-typings/src/IMessage/IMessage.ts

@@ -92,6 +92,7 @@ export type MessageTypesValues =
 	| 'command'
 	| 'videoconf'
 	| 'message_pinned'
+	| 'message_pinned_e2e'
 	| 'new-moderator'
 	| 'moderator-removed'
 	| 'new-owner'