[FIX] Always parse encrypted messages on client (#27092)

pull/27202/head
Yash Rajpal 3 years ago committed by GitHub
parent ef93facbb2
commit e2e465cbf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      apps/meteor/app/e2e/client/rocketchat.e2e.ts
  2. 15
      apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts

@ -412,10 +412,7 @@ class E2E extends Emitter {
e2e: 'done',
};
console.log('before quote', decryptedMessage);
const decryptedMessageWithQuote = await this.parseQuoteAttachment(decryptedMessage);
console.log('after quote', decryptedMessageWithQuote);
return decryptedMessageWithQuote;
}

@ -1,4 +1,12 @@
import { IMessage, isQuoteAttachment, isTranslatedMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
import {
IMessage,
isE2EEMessage,
isOTRMessage,
isQuoteAttachment,
isTranslatedMessage,
MessageAttachment,
MessageQuoteAttachment,
} from '@rocket.chat/core-typings';
import { Options, parse, Root } from '@rocket.chat/message-parser';
import { isParsedMessage } from './isParsedMessage';
@ -34,7 +42,10 @@ export const parseMessageTextToAstMarkdown = (
return {
...msg,
md: msg.md ?? textToMessageToken(text, parseOptions),
md:
isE2EEMessage(message) || isOTRMessage(message)
? textToMessageToken(text, parseOptions)
: msg.md ?? textToMessageToken(text, parseOptions),
...(msg.attachments && { attachments: parseMessageAttachments(msg.attachments, parseOptions) }),
};
};

Loading…
Cancel
Save