n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

web/statestore: fix applying undecryptable edits

Browse source
This commit is contained in:
Tulir Asokan 2025-03-01 21:44:40 +02:00
parent 014c63f0e7
commit 83ea1c12ad
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
web/src/api/statestore/room.ts
View file

@ -383,22 +383,24 @@ export class RoomStateStore {
if (memEvt.last_edit_rowid) {
memEvt.last_edit = this.eventsByRowID.get(memEvt.last_edit_rowid)
if (memEvt.last_edit) {
memEvt.orig_content = memEvt.content
memEvt.orig_local_content = memEvt.local_content
memEvt.content = memEvt.last_edit.content["m.new_content"]
memEvt.orig_content = memEvt.orig_content ?? memEvt.content
memEvt.orig_local_content = memEvt.orig_local_content ?? memEvt.local_content
memEvt.content = memEvt.last_edit.content["m.new_content"] ?? memEvt.last_edit.content
memEvt.local_content = memEvt.last_edit.local_content
}
} else if (memEvt.relation_type === "m.replace" && memEvt.relates_to) {
const editTarget = this.eventsByID.get(memEvt.relates_to)
if (editTarget?.last_edit_rowid === memEvt.rowid && !editTarget.last_edit) {
this.eventsByRowID.set(editTarget.rowid, {
if (editTarget?.last_edit_rowid === memEvt.rowid) {
const modified: MemDBEvent = {
...editTarget,
last_edit: memEvt,
orig_local_content: editTarget.local_content,
orig_content: editTarget.content,
content: memEvt.content["m.new_content"],
orig_local_content: editTarget.orig_local_content ?? editTarget.local_content,
orig_content: editTarget.orig_content ?? editTarget.content,
content: memEvt.content["m.new_content"] ?? memEvt.content,
local_content: memEvt.local_content,
})
}
this.eventsByRowID.set(editTarget.rowid, modified)
this.eventsByID.set(editTarget.event_id, modified)
this.eventSubs.notify(editTarget.event_id)
}
}