` +
+ `
${sanitizeCustomHtml(bodyModifText)}
` +
+ `
${safeHtml}
` +
+ `
`;
+ }
let content;
// handle privacy stuff
if (isPrivate) {
@@ -132,6 +161,9 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward
// we can still include the original message content in the body of the message, so we'll just use a fallback text/plain content with the original message body
content = {
...mEvent.getContent(),
+ body: newBodyPlain,
+ format: 'org.matrix.custom.html',
+ formatted_body: newBodyHtml,
'moe.sable.message.forward': {
v: 1,
is_forwarded: true,
@@ -142,6 +174,9 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward
} else {
content = {
...mEvent.getContent(),
+ body: newBodyPlain,
+ format: 'org.matrix.custom.html',
+ formatted_body: newBodyHtml,
'm.relates_to': {
rel_type: 'm.reference',
event_id: eventId,
@@ -223,3 +258,9 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward
);
}
+
+type MessageForwardItemProps = {
+ room: Room;
+ mEvent: MatrixEvent;
+ onClose?: () => void;
+};
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 2d38bacb..41a51d5c 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -539,7 +539,7 @@ function MessageInternal(
compact={messageLayout === MessageLayout.Compact}
hour24Clock={hour24Clock}
dateFormatString={dateFormatString}
- style={{ marginLeft: config.space.S100 }}
+ style={{ marginLeft: config.space.S100, justifyContent: 'flex-end' }}
/>