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

use relation handling in timelineset for replacements

Browse Source
This commit is contained in:
Bruno Windels
2019-05-16 14:35:50 +01:00
parent 07572d1e8d
commit 33e9eb371e
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/models/event-timeline-set.js
View File

@@ -747,19 +747,24 @@ EventTimelineSet.prototype.aggregateRelations = function(event) {
relationsWithRelType = relationsForEvent[relationType] = {}; relationsWithRelType = relationsForEvent[relationType] = {};
} }
let relationsWithEventType = relationsWithRelType[eventType]; let relationsWithEventType = relationsWithRelType[eventType];
const relatesToEvent = this.findEventById(relatesToEventId);
if (!relationsWithEventType) { if (!relationsWithEventType) {
relationsWithEventType = relationsWithRelType[eventType] = new Relations( relationsWithEventType = relationsWithRelType[eventType] = new Relations(
relationType, relationType,
eventType, eventType,
this.room, this.room,
); );
const relatesToEvent = this.findEventById(relatesToEventId);
if (relatesToEvent) { if (relatesToEvent) {
relatesToEvent.emit("Event.relationsCreated", relationType, eventType); relatesToEvent.emit("Event.relationsCreated", relationType, eventType);
} }
} }
relationsWithEventType.addEvent(event, relatesToEvent); relationsWithEventType.addEvent(event, relatesToEvent);
if (relationType === "m.replace" && relatesToEvent) {
const replacement = relationsWithEventType.getLastReplacement();
relatesToEvent.makeReplaced(replacement);
}
}; };
/** /**

19
src/models/room.js
View File

@@ -1032,25 +1032,6 @@ Room.prototype._addLiveEvent = function(event, duplicateStrategy) {
// this may be needed to trigger an update. // this may be needed to trigger an update.
} }
if (this._opts.unstableClientRelationReplacements && event.isRelation("m.replace")) {
const relatesTo = event.getRelation();
const replacedId = relatesTo && relatesTo.event_id;
const replacedEvent = this.getUnfilteredTimelineSet().findEventById(replacedId);
if (replacedEvent && event.getSender() === replacedEvent.getSender()) {
const doAndEmitReplacement = () => {
replacedEvent.makeReplaced(event);
this.emit("Room.replaceEvent", replacedEvent, this);
};
if (event.isBeingDecrypted()) {
event.once("Event.decrypted", doAndEmitReplacement);
} else {
doAndEmitReplacement();
}
}
}
if (event.getUnsigned().transaction_id) { if (event.getUnsigned().transaction_id) {
const existingEvent = this._txnToEvent[event.getUnsigned().transaction_id]; const existingEvent = this._txnToEvent[event.getUnsigned().transaction_id];
if (existingEvent) { if (existingEvent) {