imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass a client into RoomNotifs.getRoomNotifsState (#9631)

Browse source 
Pass an explicit client into `RoomNotifs.getRoomNotifsState`, rather than
relying on `MatrixClientPeg`. This resolves a race condition where we have a
component which thinks it is using a particular component, but
`MatrixClientPeg` has been updated.
This commit is contained in:
Richard van der Hoff 2022-11-29 10:55:15 +00:00 • committed by GitHub
parent 8bd60d09dc
commit f642765149
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
test/RoomNotifs-test.ts
View file

@ -32,7 +32,8 @@ describe("RoomNotifs test", () => {
});
it("getRoomNotifsState handles rules with no conditions", () => {
mocked(MatrixClientPeg.get()).pushRules = {
const cli = MatrixClientPeg.get();
mocked(cli).pushRules = {
global: {
override: [{
rule_id: "!roomId:server",
@ -42,16 +43,18 @@ describe("RoomNotifs test", () => {
}],
},
};
expect(getRoomNotifsState("!roomId:server")).toBe(null);
expect(getRoomNotifsState(cli, "!roomId:server")).toBe(null);
});
it("getRoomNotifsState handles guest users", () => {
mocked(MatrixClientPeg.get()).isGuest.mockReturnValue(true);
expect(getRoomNotifsState("!roomId:server")).toBe(RoomNotifState.AllMessages);
const cli = MatrixClientPeg.get();
mocked(cli).isGuest.mockReturnValue(true);
expect(getRoomNotifsState(cli, "!roomId:server")).toBe(RoomNotifState.AllMessages);
});
it("getRoomNotifsState handles mute state", () => {
MatrixClientPeg.get().pushRules = {
const cli = MatrixClientPeg.get();
cli.pushRules = {
global: {
override: [{
rule_id: "!roomId:server",
@ -66,27 +69,29 @@ describe("RoomNotifs test", () => {
}],
},
};
expect(getRoomNotifsState("!roomId:server")).toBe(RoomNotifState.Mute);
expect(getRoomNotifsState(cli, "!roomId:server")).toBe(RoomNotifState.Mute);
});
it("getRoomNotifsState handles mentions only", () => {
MatrixClientPeg.get().getRoomPushRule = () => ({
const cli = MatrixClientPeg.get();
cli.getRoomPushRule = () => ({
rule_id: "!roomId:server",
enabled: true,
default: false,
actions: [PushRuleActionName.DontNotify],
});
expect(getRoomNotifsState("!roomId:server")).toBe(RoomNotifState.MentionsOnly);
expect(getRoomNotifsState(cli, "!roomId:server")).toBe(RoomNotifState.MentionsOnly);
});
it("getRoomNotifsState handles noisy", () => {
MatrixClientPeg.get().getRoomPushRule = () => ({
const cli = MatrixClientPeg.get();
cli.getRoomPushRule = () => ({
rule_id: "!roomId:server",
enabled: true,
default: false,
actions: [{ set_tweak: TweakName.Sound, value: "default" }],
});
expect(getRoomNotifsState("!roomId:server")).toBe(RoomNotifState.AllMessagesLoud);
expect(getRoomNotifsState(cli, "!roomId:server")).toBe(RoomNotifState.AllMessagesLoud);
});
describe("getUnreadNotificationCount", () => {