matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-05 17:02:07 +03:00
Code Activity

make replacements work in e2e rooms

Browse Source
This commit is contained in:
Bruno Windels
2019-05-15 14:54:21 +01:00
parent 5fd001354a
commit 1c1781ce76
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/models/event.js
View File

@@ -758,6 +758,10 @@ utils.extend(module.exports.MatrixEvent.prototype, {
if (this.isRedacted()) { if (this.isRedacted()) {
return; return;
} }
if (newEvent.isBeingDecrypted()) {
throw new Error("Trying to replace event when " +
"new content hasn't been decrypted yet");
}
const oldContent = this.getContent(); const oldContent = this.getContent();
const newContent = newEvent.getContent()["m.new_content"]; const newContent = newEvent.getContent()["m.new_content"];
// need to always replace m.relates_to with the old one, // need to always replace m.relates_to with the old one,

8
src/models/room.js
View File

@@ -1038,8 +1038,16 @@ Room.prototype._addLiveEvent = function(event, duplicateStrategy) {
const replacedId = relatesTo && relatesTo.event_id; const replacedId = relatesTo && relatesTo.event_id;
const replacedEvent = this.getUnfilteredTimelineSet().findEventById(replacedId); const replacedEvent = this.getUnfilteredTimelineSet().findEventById(replacedId);
if (replacedEvent) { if (replacedEvent) {
const doAndEmitReplacement = () => {
replacedEvent.makeReplaced(event); replacedEvent.makeReplaced(event);
this.emit("Room.replaceEvent", replacedEvent, this); this.emit("Room.replaceEvent", replacedEvent, this);
};
if (event.isBeingDecrypted()) {
event.once("Event.decrypted", doAndEmitReplacement);
} else {
doAndEmitReplacement();
}
} }
} }