Skip to content

Remove null value from message forwarding metadata #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7w1 merged 1 commit into from
Mar 26, 2026
+14 −7
Merged

Remove null value from message forwarding metadata #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fix_forwarding_metadata.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

fix forwarding metadata by removing the `null` value
16 changes: 9 additions & 7 deletions src/app/components/message/modals/MessageForward.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ type ForwardMeta = {

// see https://github.com/hummlbach/matrix-doc/blob/acea0854a1c9489599295a858b068ce02a6b2b20/proposals/2723-add-forward-info.md
type MSC2723ForwardMeta = {
event_id: string;
room_id: string;
sender: string | null; // we won't set this field
event_id?: string;
room_id?: string;
sender?: string; // we won't set this field
origin_server_ts: number;
};

Expand Down Expand Up @@ -205,9 +205,9 @@ export function MessageForwardInternal({
newBodyPlain = originalBody.length > 0 ? `${bodyModifText}\n\n${quotedBody}` : bodyModifText;

const safeHtml =
originalFormattedBody !== undefined
? sanitizeCustomHtml(originalFormattedBody)
: sanitizeCustomHtml(originalBody).replaceAll('\n', '<br>');
originalFormattedBody === undefined
? sanitizeCustomHtml(originalBody).replaceAll('\n', '<br>')
: sanitizeCustomHtml(originalFormattedBody);

newBodyHtml =
`<div data-forward-marker>` +
Expand Down Expand Up @@ -241,6 +241,9 @@ export function MessageForwardInternal({
original_timestamp: mEvent.getTs(),
original_event_private: true,
} satisfies ForwardMeta,
'com.famedly.app.forwarded': {
origin_server_ts: mEvent.getTs(),
} satisfies MSC2723ForwardMeta,
};
} else {
content = {
Expand All @@ -261,7 +264,6 @@ export function MessageForwardInternal({
'com.famedly.app.forwarded': {
event_id: eventId,
room_id: room.roomId,
sender: null, // we won't set this field, as a design decision to avoid potential privacy issues and since the sender can be inferred from the event_id and room_id if needed
origin_server_ts: mEvent.getTs(),
} satisfies MSC2723ForwardMeta,
};
Expand Down
Loading