Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix delayed badge update for mentions in encrypted rooms #7813

Merged
merged 3 commits into from
Feb 15, 2022
Merged

Fix delayed badge update for mentions in encrypted rooms #7813

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
841cb09
Fix delayed badge update for mentions in encrypted rooms
dbkr Feb 15, 2022
1713f99
Remove unused import
dbkr Feb 15, 2022
1d28e4b
Fix listener removal
dbkr Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/stores/notifications/RoomNotificationState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class RoomNotificationState extends NotificationState implements IDestroy
this.room.on("Room.redaction", this.handleRoomEventUpdate);
this.room.on("Room.myMembership", this.handleMembershipUpdate);
this.room.on("Room.localEchoUpdated", this.handleLocalEchoUpdated);
MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
MatrixClientPeg.get().on("Event.decrypted", this.onEventDecrypted);
MatrixClientPeg.get().on("accountData", this.handleAccountDataUpdate);
this.updateNotificationState();
}
Expand All @@ -52,7 +52,7 @@ export class RoomNotificationState extends NotificationState implements IDestroy
this.room.removeListener("Room.myMembership", this.handleMembershipUpdate);
this.room.removeListener("Room.localEchoUpdated", this.handleLocalEchoUpdated);
if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
MatrixClientPeg.get().removeListener("Event.decrypted", this.onEventDecrypted);
MatrixClientPeg.get().removeListener("accountData", this.handleAccountDataUpdate);
}
}
Expand All @@ -71,8 +71,15 @@ export class RoomNotificationState extends NotificationState implements IDestroy
this.updateNotificationState();
};

private onEventDecrypted = (event: MatrixEvent) => {
if (event.getRoomId() !== this.room.roomId) return; // ignore - not for us or notifications timeline

this.updateNotificationState();
};

private handleRoomEventUpdate = (event: MatrixEvent, room: Room | null) => {
if (room?.roomId !== this.room.roomId) return; // ignore - not for us or notifications timeline

this.updateNotificationState();
};

Expand Down