Fix spurious notifications on non-live events (#11133)
* Fix notifier not discriminating removed and backpaginated events * Ignore events on the thread list generated timelines * Add test * tsc strict
This commit is contained in:
parent
f73fc496e2
commit
5cf818fefa
2 changed files with 27 additions and 1 deletions
|
@ -412,9 +412,11 @@ class NotifierClass {
|
||||||
removed: boolean,
|
removed: boolean,
|
||||||
data: IRoomTimelineData,
|
data: IRoomTimelineData,
|
||||||
): void => {
|
): 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 (!this.isSyncing) return; // don't alert for any messages initially
|
||||||
if (ev.getSender() === MatrixClientPeg.safeGet().getUserId()) return;
|
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);
|
MatrixClientPeg.safeGet().decryptEventIfNeeded(ev);
|
||||||
|
|
||||||
|
|
|
@ -538,4 +538,28 @@ describe("Notifier", () => {
|
||||||
expect(localStorage.getItem("notifications_hidden")).toBeTruthy();
|
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();
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue