prevent parsing upstream instead of lower level code

Author: nazabucciarelli

apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx

@@ -13,6 +13,7 @@ import AttachmentAuthorName from './structure/AttachmentAuthorName';
 import AttachmentContent from './structure/AttachmentContent';
 import AttachmentDetails from './structure/AttachmentDetails';
 import AttachmentInner from './structure/AttachmentInner';
+import { useMaxMessageParseSize } from '../../hooks/useMaxMessageParseSize';
 
 // TODO: remove this team collaboration
 const quoteStyles = css`
@@ -38,6 +39,7 @@ type QuoteAttachmentProps = {
 export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps): ReactElement => {
 	const formatTime = useTimeAgo();
 	const displayAvatarPreference = useUserPreference<boolean>('displayAvatars');
+	const maxMessageParseSize = useMaxMessageParseSize();
 
 	return (
 		<>
@@ -71,7 +73,11 @@ export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps): ReactElem
 							<Attachments attachments={attachment.attachments} id={attachment.attachments[0]?.title_link} />
 						</AttachmentInner>
 					)}
-					{attachment.md ? <MessageContentBody md={attachment.md} /> : attachment.text.substring(attachment.text.indexOf('\n') + 1)}
+					{attachment.text?.length <= maxMessageParseSize && attachment.md ? (
+						<MessageContentBody md={attachment.md} />
+					) : (
+						attachment.text.substring(attachment.text.indexOf('\n') + 1)
+					)}
 				</AttachmentDetails>
 			</AttachmentContent>
 		</>

apps/meteor/client/components/message/hooks/useNormalizedMessage.ts

@@ -77,7 +77,20 @@ export const useNormalizedMessage = <TMessage extends IMessage>(message: TMessag
 			}),
 		};
 
-		const normalizedMessage = parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions, maxMessageParseSize);
+		if (message.msg && message.msg.length > maxMessageParseSize) {
+			return {
+				...message,
+				md: [
+					{
+						type: 'PARAGRAPH',
+						value: [{ type: 'PLAIN_TEXT', value: message.msg }],
+					},
+				],
+				attachments: message.attachments,
+			};
+		}
+
+		const normalizedMessage = parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions);
 
 		if (normalizedMessage.attachments) {
 			normalizedMessage.attachments = normalizeAttachments(

apps/meteor/client/lib/constants.ts

@@ -3,4 +3,4 @@ export const BIO_TEXT_MAX_LENGTH = 260;
 export const VIDEOCONF_STACK_MAX_USERS = 6;
 export const NAVIGATION_REGION_ID = 'navigation-region';
 export const MAX_FILE_SIZE_PREVIEW = 10485760; // 10MB
-export const MESSAGE_PARSE_HARD_LIMIT = 5000;
+export const MESSAGE_PARSE_HARD_LIMIT = 10000;

apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts

@@ -28,22 +28,19 @@ export const parseMessageTextToAstMarkdown = <
 	message: TMessage,
 	parseOptions: Options,
 	autoTranslateOptions: AutoTranslateOptions,
-	maxMessageParseSize: number,
 ): MessageWithMdEnforced => {
 	const msg = removePossibleNullMessageValues(message);
 	const { showAutoTranslate, autoTranslateLanguage } = autoTranslateOptions;
 	const translations = autoTranslateLanguage && isTranslatedMessage(msg) && msg.translations;
 	const translated = showAutoTranslate(message);
 
 	const text = (translated && translations && translations[autoTranslateLanguage]) || msg.msg;
+
 	return {
 		...msg,
-		md:
-			isE2EEMessage(message) || translated
-				? textToMessageToken(text, parseOptions, maxMessageParseSize)
-				: (msg.md ?? textToMessageToken(text, parseOptions, maxMessageParseSize)),
+		md: isE2EEMessage(message) || translated ? textToMessageToken(text, parseOptions) : (msg.md ?? textToMessageToken(text, parseOptions)),
 		...(msg.attachments && {
-			attachments: parseMessageAttachments(msg.attachments, parseOptions, { autoTranslateLanguage, translated }, maxMessageParseSize),
+			attachments: parseMessageAttachments(msg.attachments, parseOptions, { autoTranslateLanguage, translated }),
 		}),
 	};
 };
@@ -52,15 +49,14 @@ export const parseMessageAttachment = <T extends MessageAttachment>(
 	attachment: T,
 	parseOptions: Options,
 	autoTranslateOptions: { autoTranslateLanguage?: string; translated: boolean },
-	maxMessageParseSize: number,
 ): T => {
 	const { translated, autoTranslateLanguage } = autoTranslateOptions;
 	if (!attachment.text) {
 		return attachment;
 	}
 
 	if (isQuoteAttachment(attachment) && attachment.attachments) {
-		attachment.attachments = parseMessageAttachments(attachment.attachments, parseOptions, autoTranslateOptions, maxMessageParseSize);
+		attachment.attachments = parseMessageAttachments(attachment.attachments, parseOptions, autoTranslateOptions);
 	}
 
 	const text =
@@ -70,18 +66,15 @@ export const parseMessageAttachment = <T extends MessageAttachment>(
 
 	return {
 		...attachment,
-		md: translated
-			? textToMessageToken(text, parseOptions, maxMessageParseSize)
-			: (attachment.md ?? textToMessageToken(text, parseOptions, maxMessageParseSize)),
+		md: translated ? textToMessageToken(text, parseOptions) : (attachment.md ?? textToMessageToken(text, parseOptions)),
 	};
 };
 
 export const parseMessageAttachments = <T extends MessageAttachment>(
 	attachments: T[],
 	parseOptions: Options,
 	autoTranslateOptions: { autoTranslateLanguage?: string; translated: boolean },
-	maxMessageParseSize: number,
-): T[] => attachments.map((attachment) => parseMessageAttachment(attachment, parseOptions, autoTranslateOptions, maxMessageParseSize));
+): T[] => attachments.map((attachment) => parseMessageAttachment(attachment, parseOptions, autoTranslateOptions));
 
 const isNotNullOrUndefined = (value: unknown): boolean => value !== null && value !== undefined;
 
@@ -112,30 +105,17 @@ export const removePossibleNullMessageValues = <TMessage extends IMessage = IMes
 	...(isNotNullOrUndefined(reactions) && { reactions }),
 });
 
-const textToMessageToken = (textOrRoot: string | Root, parseOptions: Options, maxMessageParseSize: number): Root => {
+const textToMessageToken = (textOrRoot: string | Root, parseOptions: Options): Root => {
 	if (!textOrRoot) {
 		return [];
 	}
 
 	if (isParsedMessage(textOrRoot)) {
 		return textOrRoot;
 	}
-	if (textOrRoot.length > maxMessageParseSize) {
-		return [
-			{
-				type: 'PARAGRAPH',
-				value: [
-					{
-						type: 'PLAIN_TEXT',
-						value: textOrRoot,
-					},
-				],
-			},
-		];
-	}
-	const result = parse(textOrRoot, parseOptions);
+	const parsedMessage = parse(textOrRoot, parseOptions);
 
-	const parsedMessageCleaned = result[0].type !== 'LINE_BREAK' ? result : (result.slice(1) as Root);
+	const parsedMessageCleaned = parsedMessage[0].type !== 'LINE_BREAK' ? parsedMessage : (parsedMessage.slice(1) as Root);
 
 	return parsedMessageCleaned;
 };

apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx

@@ -15,12 +15,17 @@ export const useMessageBody = (message: IMessage | undefined, maxMessageParseSiz
 			return '';
 		}
 
+		if (message.msg && message.msg.length > maxMessageParseSize) {
+			return message.msg;
+		}
+
 		if (message.md) {
 			const parseOptions: Options = {
 				customDomains,
 				emoticons: true,
 			};
-			const messageWithMd = parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions, maxMessageParseSize);
+
+			const messageWithMd = parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions);
 
 			return messageWithMd.md;
 		}