fix: imported fixes (#32815)

RocketChat · Jul 18, 2024 · 91947da · 91947da
1 parent 1ae7b59
commit 91947da
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 30 deletions.
diff --git a/.changeset/violet-brooms-press.md b/.changeset/violet-brooms-press.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)
diff --git a/apps/meteor/app/discussion/client/index.ts b/apps/meteor/app/discussion/client/index.ts
@@ -1,3 +1,2 @@
 // Other UI extensions
-import './lib/messageTypes/discussionMessage';
 import './createDiscussionMessageAction';
diff --git a/apps/meteor/app/discussion/client/lib/messageTypes/discussionMessage.js b/apps/meteor/app/discussion/client/lib/messageTypes/discussionMessage.js
diff --git a/apps/meteor/app/ui-utils/lib/MessageTypes.ts b/apps/meteor/app/ui-utils/lib/MessageTypes.ts
@@ -5,8 +5,6 @@ export type MessageType = {
 	id: MessageTypesValues;
 	system?: boolean;
 	/* deprecated */
-	render?: (message: IMessage) => string;
-	/* deprecated */
 	template?: (message: IMessage) => unknown;
 	message: TranslationKey;
 	data?: (message: IMessage) => Record<string, string>;

diff --git a/apps/meteor/app/ui-utils/server/Message.ts b/apps/meteor/app/ui-utils/server/Message.ts
@@ -11,9 +11,6 @@ export const Message = {
 	parse(msg: IMessage, language: string) {
 		const messageType = MessageTypes.getType(msg);
 		if (messageType) {
-			if (messageType.render) {
-				return messageType.render(msg);
-			}
 			if (messageType.template) {
 				// Render message
 				return;

diff --git a/apps/meteor/client/components/message/variants/SystemMessage.tsx b/apps/meteor/client/components/message/variants/SystemMessage.tsx
@@ -89,14 +89,9 @@ const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps
 						{showUsername && <MessageUsername data-username={user.username}>@{user.username}</MessageUsername>}
 					</MessageNameContainer>
 					{messageType && (
-						<MessageSystemBody
-							data-qa-type='system-message-body'
-							dangerouslySetInnerHTML={{
-								__html: messageType.render
-									? messageType.render(message)
-									: t(messageType.message, messageType.data ? messageType.data(message) : {}),
-							}}
-						/>
+						<MessageSystemBody data-qa-type='system-message-body'>
+							{t(messageType.message, messageType.data ? messageType.data(message) : {})}
+						</MessageSystemBody>
 					)}
 					<MessageSystemTimestamp title={formatDateAndTime(message.ts)}>{formatTime(message.ts)}</MessageSystemTimestamp>
 				</MessageSystemBlock>