Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't accept any locally known edits earlier than the last known server-side aggregated edit #986

Merged
merged 1 commit into from
Jul 10, 2019
Merged

Don't accept any locally known edits earlier than the last known server-side aggregated edit #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/models/event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ utils.extend(module.exports.MatrixEvent.prototype, {
return this.status;
},

_getServerAggregatedRelation(relType) {
getServerAggregatedRelation(relType) {
const relations = this.getUnsigned()["m.relations"];
if (relations) {
return relations[relType];
Expand All @@ -911,7 +911,7 @@ utils.extend(module.exports.MatrixEvent.prototype, {
* @return {string?}
*/
replacingEventId() {
const replaceRelation = this._getServerAggregatedRelation("m.replace");
const replaceRelation = this.getServerAggregatedRelation("m.replace");
if (replaceRelation) {
return replaceRelation.event_id;
} else if (this._replacingEvent) {
Expand All @@ -936,7 +936,7 @@ utils.extend(module.exports.MatrixEvent.prototype, {
* @return {Date?}
*/
replacingEventDate() {
const replaceRelation = this._getServerAggregatedRelation("m.replace");
const replaceRelation = this.getServerAggregatedRelation("m.replace");
if (replaceRelation) {
const ts = replaceRelation.origin_server_ts;
if (Number.isFinite(ts)) {
Expand Down
10 changes: 10 additions & 0 deletions src/models/relations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,20 @@ export default class Relations extends EventEmitter {
// event is known anyway.
return null;
}

// the all-knowning server tells us that the event at some point had
// this timestamp for its replacement, so any following replacement should definitely not be less
const replaceRelation =
this._targetEvent.getServerAggregatedRelation("m.replace");
const minTs = replaceRelation && replaceRelation.origin_server_ts;

return this.getRelations().reduce((last, event) => {
if (event.getSender() !== this._targetEvent.getSender()) {
return last;
}
if (minTs && minTs > event.getTs()) {
return last;
}
if (last && last.getTs() > event.getTs()) {
return last;
}
Expand Down