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

[Fix] Nullcheck redactedEvent (#2103)

Browse Source 
We should only check whether a redacted event is a visibility event *if the redacted event is not null*.
This commit is contained in:
David Teller
2022-01-12 13:27:03 +01:00
committed by GitHub
parent 96d1b30012
commit 4acb98c496
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/models/room.ts
View File

@@ -1441,6 +1441,15 @@ export class Room extends EventEmitter {
// (in the sender and target fields). We should get those // (in the sender and target fields). We should get those
// RoomMember objects to update themselves when the events that // RoomMember objects to update themselves when the events that
// they are based on are changed. // they are based on are changed.
// Remove any visibility change on this event.
this.visibilityEvents.delete(redactId);
// If this event is a visibility change event, remove it from the
// list of visibility changes and update any event affected by it.
if (redactedEvent.isVisibilityEvent()) {
this.redactVisibilityChangeEvent(event);
}
} }
// FIXME: apply redactions to notification list // FIXME: apply redactions to notification list
@@ -1448,15 +1457,6 @@ export class Room extends EventEmitter {
// NB: We continue to add the redaction event to the timeline so // NB: We continue to add the redaction event to the timeline so
// clients can say "so and so redacted an event" if they wish to. Also // clients can say "so and so redacted an event" if they wish to. Also
// this may be needed to trigger an update. // this may be needed to trigger an update.
// Remove any visibility change on this event.
this.visibilityEvents.delete(redactId);
// If this event is a visibility change event, remove it from the
// list of visibility changes and update any event affected by it.
if (redactedEvent.isVisibilityEvent()) {
this.redactVisibilityChangeEvent(event);
}
} }
// Implement MSC3531: hiding messages. // Implement MSC3531: hiding messages.