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

handle redactions in room pending event logic

Browse Source
This commit is contained in:
Bruno Windels
2019-06-03 18:37:01 +02:00
parent 465032dd4f
commit 2eecea9a07
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/models/room.js
View File

@@ -1124,6 +1124,15 @@ Room.prototype.addPendingEvent = function(event, txnId) {
} }
} }
} }
if (event.getType() === "m.room.redaction") {
const redactId = event.event.redacts;
const redactedEvent = this.getUnfilteredTimelineSet().findEventById(redactId);
if (redactedEvent) {
redactedEvent.markLocallyRedacted(event);
this.emit("Room.redaction", event, this);
}
}
} else { } else {
for (let i = 0; i < this._timelineSets.length; i++) { for (let i = 0; i < this._timelineSets.length; i++) {
const timelineSet = this._timelineSets[i]; const timelineSet = this._timelineSets[i];
@@ -1368,6 +1377,17 @@ Room.prototype.removeEvent = function(eventId) {
for (let i = 0; i < this._timelineSets.length; i++) { for (let i = 0; i < this._timelineSets.length; i++) {
const removed = this._timelineSets[i].removeEvent(eventId); const removed = this._timelineSets[i].removeEvent(eventId);
if (removed) { if (removed) {
// undo local echo of redaction
if (removed.getType() === "m.room.redaction") {
const redactId = event.event.redacts;
const redactedEvent = this.getUnfilteredTimelineSet()
.findEventById(redactId);
if (redactedEvent) {
redactedEvent.unmarkLocallyRedacted();
// re-render after undoing redaction
this.emit("Room.redaction", removed, this);
}
}
removedAny = true; removedAny = true;
} }
} }