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

Fix spurious notifications on non-live events #11133

Merged
merged 7 commits into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/Notifier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,11 @@ class NotifierClass {
removed: boolean,
data: IRoomTimelineData,
): void => {
if (!data.liveEvent) return; // only notify for new things, not old.
if (removed) return; // only notify for new events, not removed ones
if (!data.liveEvent || !!toStartOfTimeline) return; // only notify for new things, not old.
if (!this.isSyncing) return; // don't alert for any messages initially
if (ev.getSender() === MatrixClientPeg.safeGet().getUserId()) return;
if (data.timeline.getTimelineSet().threadListType !== null) return; // Ignore events on the thread list generated timelines

MatrixClientPeg.safeGet().decryptEventIfNeeded(ev);

Expand Down
24 changes: 24 additions & 0 deletions test/Notifier-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -538,4 +538,28 @@ describe("Notifier", () => {
expect(localStorage.getItem("notifications_hidden")).toBeTruthy();
});
});

describe("onEvent", () => {
it("should not evaluate events from the thread list fake timeline sets", async () => {
mockClient.supportsThreads.mockReturnValue(true);

const fn = jest.spyOn(Notifier, "evaluateEvent");

await testRoom.createThreadsTimelineSets();
testRoom.threadsTimelineSets[0]!.addEventToTimeline(
mkEvent({
event: true,
type: "m.room.message",
user: "@user1:server",
room: roomId,
content: { body: "this is a thread root" },
}),
testRoom.threadsTimelineSets[0]!.getLiveTimeline(),
false,
false,
);

expect(fn).not.toHaveBeenCalled();
});
});
});