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 sure where not re-adding cancelled events when undoing local red.

Browse Source
This commit is contained in:
Bruno Windels
2019-06-12 10:22:39 +02:00
parent 930de640ac
commit 5602b94dcb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/models/room.js
View File

@@ -1356,7 +1356,10 @@ Room.prototype._revertRedactionLocalEcho = function(redactionEvent) {
// re-render after undoing redaction // re-render after undoing redaction
this.emit("Room.redactionCancelled", redactionEvent, this); this.emit("Room.redactionCancelled", redactionEvent, this);
// reapply relation now redaction failed // reapply relation now redaction failed
if (redactedEvent.isRelation()) { if (
redactedEvent.isRelation() &&
redactedEvent.status !== EventStatus.CANCELLED
) {
this._aggregateNonLiveRelation(redactedEvent); this._aggregateNonLiveRelation(redactedEvent);
} }
} }