Skip to content
Snippets Groups Projects
Unverified Commit 3bfdd718 authored by dionisio-bot[bot]'s avatar dionisio-bot[bot] Committed by GitHub
Browse files

fix: imported fixes (#32815) (#32836)

parent 43feaab5
Branches release-6.10.1
No related tags found
No related merge requests found
---
'@rocket.chat/meteor': patch
---
Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)
// Other UI extensions
import './lib/messageTypes/discussionMessage';
import './createDiscussionMessageAction';
import { Meteor } from 'meteor/meteor';
import { MessageTypes } from '../../../../ui-utils/client';
Meteor.startup(() => {
MessageTypes.registerType({
id: 'discussion-created',
system: false,
message: 'discussion-created',
data(message) {
return {
message: `<svg class="rc-icon" aria-hidden="true"><use xlink:href="#icon-discussion"></use></svg> ${message.msg}`,
};
},
});
});
......@@ -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>;
......
......@@ -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;
......
......@@ -94,14 +94,9 @@ const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps
)}
</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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment