LotusGuild/cinny
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: edit history original shows pre-edit content

Browse Source 
mEvent.getContent() returns post-edit content because matrix-js-sdk applies
the latest replace event in-memory. Reading mEvent.event.content gives the
raw server content (the true original before any edits). Edit entries from
the relations API correctly use m.new_content per Matrix spec.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jared Vititoe
2026-06-02 10:51:21 -04:00
parent 7b01cfebf5
commit 2b115390f2
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/features/room/message/EditHistoryModal.tsx
+16 -7
View File
@@ -56,11 +56,7 @@ function isRawEditEvent(raw: unknown): raw is RawEditEvent {
return typeof r.event_id === 'string' && typeof r.origin_server_ts === 'number'; return typeof r.event_id === 'string' && typeof r.origin_server_ts === 'number';
} }
function getVersionContent(evt: MatrixEvent): ReactNode { function renderContent(source: Record<string, unknown>): ReactNode {
const content = evt.getContent();
const newContent = content['m.new_content'] as Record<string, unknown> | undefined;
const source = newContent ?? content;
const format = source.format; const format = source.format;
const formattedBody = source.formatted_body; const formattedBody = source.formatted_body;
if ( if (
@@ -70,12 +66,25 @@ function getVersionContent(evt: MatrixEvent): ReactNode {
) { ) {
return parse(sanitizeCustomHtml(formattedBody)); return parse(sanitizeCustomHtml(formattedBody));
} }
const body = source.body; const body = source.body;
const text = typeof body === 'string' ? body : '(no text)'; const text = typeof body === 'string' ? body : '(no text)';
return <Linkify options={LINKIFY_OPTS}>{text}</Linkify>; return <Linkify options={LINKIFY_OPTS}>{text}</Linkify>;
} }
function getOriginalContent(evt: MatrixEvent): ReactNode {
// mEvent.getContent() returns the SDK-applied post-edit content.
// Read the raw server event to get the actual original pre-edit text.
const raw = (evt.event as { content?: Record<string, unknown> }).content ?? {};
return renderContent(raw);
}
function getVersionContent(evt: MatrixEvent): ReactNode {
// Edit events carry the new text in m.new_content per Matrix spec.
const content = evt.getContent();
const newContent = content['m.new_content'] as Record<string, unknown> | undefined;
return renderContent(newContent ?? content);
}
export function EditHistoryModal({ room, mEvent, onClose }: EditHistoryModalProps) { export function EditHistoryModal({ room, mEvent, onClose }: EditHistoryModalProps) {
const mx = useMatrixClient(); const mx = useMatrixClient();
const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock'); const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock');
@@ -126,7 +135,7 @@ export function EditHistoryModal({ room, mEvent, onClose }: EditHistoryModalProp
return `${date} at ${time}`; return `${date} at ${time}`;
}; };
const originalContent = getVersionContent(mEvent); const originalContent = getOriginalContent(mEvent);
const originalTs = mEvent.getTs(); const originalTs = mEvent.getTs();