matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-11 19:37:30 +03:00
Code Activity

prevent earlier replacements from messing things up

Browse Source
This commit is contained in:
Bruno Windels
2019-05-15 14:54:52 +01:00
parent 1c1781ce76
commit ad48d2997e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/models/event.js
View File

@@ -758,6 +758,10 @@ utils.extend(module.exports.MatrixEvent.prototype, {
if (this.isRedacted()) { if (this.isRedacted()) {
return; return;
} }
// ignore previous replacements
if (this._replacingEvent && this._replacingEvent.getTs() > newEvent.getTs()) {
return;
}
if (newEvent.isBeingDecrypted()) { if (newEvent.isBeingDecrypted()) {
throw new Error("Trying to replace event when " + throw new Error("Trying to replace event when " +
"new content hasn't been decrypted yet"); "new content hasn't been decrypted yet");