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

Fix edit history being broken after editing an unencrypted event with an encrypted event (#2013)

Browse Source
This commit is contained in:
Aaron R
2021-11-08 02:55:41 -06:00
committed by GitHub
parent 43bc09f392
commit 9d9d9e2cfa
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.ts
View File

@@ -6015,7 +6015,9 @@ export class MatrixClient extends EventEmitter {
if (fetchedEventType === EventType.RoomMessageEncrypted) { if (fetchedEventType === EventType.RoomMessageEncrypted) {
const allEvents = originalEvent ? events.concat(originalEvent) : events; const allEvents = originalEvent ? events.concat(originalEvent) : events;
await Promise.all(allEvents.map(e => { await Promise.all(allEvents.map(e => {
return new Promise(resolve => e.once("Event.decrypted", resolve)); if (e.isEncrypted()) {
return new Promise(resolve => e.once("Event.decrypted", resolve));
}
})); }));
events = events.filter(e => e.getType() === eventType); events = events.filter(e => e.getType() === eventType);
} }