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

also look for redaction local echo event in pendingList

Browse Source 
also re-aggregate the relation if it's redaction has been cancelled
This commit is contained in:
Bruno Windels
2019-06-04 11:55:48 +02:00
parent 8194287391
commit 78cf175f5a
1 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/models/room.js
View File

@@ -1108,21 +1108,7 @@ Room.prototype.addPendingEvent = function(event, txnId) {
this._pendingEventList.push(event); this._pendingEventList.push(event);
if (event.isRelation()) { if (event.isRelation()) {
// For pending events, add them to the relations collection immediately. this._aggregateNonLiveEvent(event);
// (The alternate case below already covers this as part of adding to
// the timeline set.)
// TODO: We should consider whether this means it would be a better
// design to lift the relations handling up to the room instead.
for (let i = 0; i < this._timelineSets.length; i++) {
const timelineSet = this._timelineSets[i];
if (timelineSet.getFilter()) {
if (this._filter.filterRoomTimeline([event]).length) {
timelineSet.aggregateRelations(event);
}
} else {
timelineSet.aggregateRelations(event);
}
}
} }
if (event.getType() === "m.room.redaction") { if (event.getType() === "m.room.redaction") {
@@ -1150,6 +1136,25 @@ Room.prototype.addPendingEvent = function(event, txnId) {
this.emit("Room.localEchoUpdated", event, this, null, null); this.emit("Room.localEchoUpdated", event, this, null, null);
}; };
// live events are aggregated in the timelineset
// but for local echo (and undoing the local echo of a redaction) we do it here.
Room.prototype._aggregateNonLiveEvent = function(event) {
// For pending events, add them to the relations collection immediately.
// (The alternate case below already covers this as part of adding to
// the timeline set.)
// TODO: We should consider whether this means it would be a better
// design to lift the relations handling up to the room instead.
for (let i = 0; i < this._timelineSets.length; i++) {
const timelineSet = this._timelineSets[i];
if (timelineSet.getFilter()) {
if (this._filter.filterRoomTimeline([event]).length) {
timelineSet.aggregateRelations(event);
}
} else {
timelineSet.aggregateRelations(event);
}
}
};
/** /**
* Deal with the echo of a message we sent. * Deal with the echo of a message we sent.
@@ -1286,12 +1291,13 @@ Room.prototype.updatePendingEvent = function(event, newStatus, newEventId) {
} else if (newStatus == EventStatus.CANCELLED) { } else if (newStatus == EventStatus.CANCELLED) {
// remove it from the pending event list, or the timeline. // remove it from the pending event list, or the timeline.
if (this._pendingEventList) { if (this._pendingEventList) {
utils.removeElement( const idx = this._pendingEventList.findIndex(ev => ev.getId() === oldEventId);
this._pendingEventList, if (idx !== -1) {
function(ev) { const [removedEvent] = this._pendingEventList.splice(idx, 1);
return ev.getId() == oldEventId; if (removedEvent.getType() === "m.room.redaction") {
}, false, this._revertRedactionLocalEcho(removedEvent);
); }
}
} }
this.removeEvent(oldEventId); this.removeEvent(oldEventId);
} }
@@ -1299,6 +1305,23 @@ Room.prototype.updatePendingEvent = function(event, newStatus, newEventId) {
this.emit("Room.localEchoUpdated", event, this, oldEventId, oldStatus); this.emit("Room.localEchoUpdated", event, this, oldEventId, oldStatus);
}; };
Room.prototype._revertRedactionLocalEcho = function(redactionEvent) {
const redactId = redactionEvent.event.redacts;
if (!redactId) {
return;
}
const redactedEvent = this.getUnfilteredTimelineSet()
.findEventById(redactId);
if (redactedEvent) {
redactedEvent.unmarkLocallyRedacted();
// re-render after undoing redaction
this.emit("Room.redaction", redactionEvent, this);
// reapply relation now redaction failed
if (redactedEvent.isRelation()) {
this._aggregateNonLiveEvent(redactedEvent);
}
}
};
/** /**
* Add some events to this room. This can include state events, message * Add some events to this room. This can include state events, message
@@ -1377,16 +1400,8 @@ 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") { if (removed.getType() === "m.room.redaction") {
const redactId = event.event.redacts; this._revertRedactionLocalEcho(removed);
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;
} }