matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into revert-1493-revert-1487-dbkr/tsify_call

Browse Source
This commit is contained in:
David Baker
2020-10-07 15:16:21 +01:00
parent 81c95224d1 f5240cdac6
commit 8632ca6e37
12 changed files with 117 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client.js
View File

@@ -5595,9 +5595,8 @@ function _PojoToMatrixEventMapper(client, options) {
}
event.attemptDecryption(client._crypto);
}
const room = client.getRoom(event.getRoomId());
if (room && !preventReEmit) {
room.reEmitter.reEmit(event, ["Event.replaced"]);
if (!preventReEmit) {
client.reEmitter.reEmit(event, ["Event.replaced"]);
}
return event;
}