Local echo for m.replace relations #920
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
now that event can be replaced from Relations instead of Room Also make `makeReplaced` non-destructive by not touching the original event.content, so it can be undone by later calls.
jryans
requested changes
May 16, 2019
src/models/event.js
Outdated
| return this._clearEvent.content || this.event.content || {}; | ||
| if (this._replacingEvent && !this.isRedacted()) { | ||
| return this._replacingEvent.getContent()["m.new_content"] || {}; | ||
| // content = Object.assign({}, content, newContent); |
There was a problem hiding this comment.
I'm assuming this gets removed later...
src/models/event.js
Outdated
| @@ -226,7 +226,12 @@ utils.extend(module.exports.MatrixEvent.prototype, { | |||
| * @return {Object} The event content JSON, or an empty object. | |||
| */ | |||
| getContent: function() { | |||
| return this._clearEvent.content || this.event.content || {}; | |||
| if (this._replacingEvent && !this.isRedacted()) { | |||
There was a problem hiding this comment.
Why the redacted check here...?
There was a problem hiding this comment.
Because we don't want to return any replaced content for a redacted event. I guess a better way to do this would be to set this._replacingEvent to null in makeRedacted.
src/models/event-timeline-set.js
Outdated
| @@ -759,7 +759,7 @@ EventTimelineSet.prototype.aggregateRelations = function(event) { | |||
| } | |||
| } | |||
|
|
|||
| relationsWithEventType.addEvent(event); | |||
| relationsWithEventType.addEvent(event, relatesToEvent); | |||
There was a problem hiding this comment.
We should add a separate setTargetEvent or similar to do this separately, and also ensure we only do it one time per relations collection (once the target event is found), as findEventById is not very efficient.
call makeReplaced from addEvent instead so it's all done from Relations
as redaction supersedes a replacement
jryans
approved these changes
May 16, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of: element-hq/element-web#9671
React-SDK PR: matrix-org/matrix-react-sdk#2982