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 pull request #1491 from matrix-org/t3chguy/fix/9836

Browse Source 
Fix re-emit of Event.replaced to be on client and not room
This commit is contained in:
Michael Telatynski
2020-10-06 22:50:14 +01:00
committed by GitHub
parent 2f316c558d 15b2e3ff1d
commit d7ef128510
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client.js
View File

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

2
src/models/event.js
View File

@@ -904,6 +904,8 @@ utils.extend(MatrixEvent.prototype, {
/** /**
* Set an event that replaces the content of this event, through an m.replace relation. * Set an event that replaces the content of this event, through an m.replace relation.
* *
* @fires module:models/event.MatrixEvent#"Event.replaced"
*
* @param {MatrixEvent?} newEvent the event with the replacing content, if any. * @param {MatrixEvent?} newEvent the event with the replacing content, if any.
*/ */
makeReplaced(newEvent) { makeReplaced(newEvent) {