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

Implement new model, hooks and reconcilation code for new GYU notification settings #11089

Merged
merged 10 commits into from
Jun 17, 2023
Merged
Show file tree
Hide file tree
Changes from 6 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
40 changes: 40 additions & 0 deletions src/hooks/useAsyncRefreshMemo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { DependencyList, useCallback, useEffect, useState } from "react";

type Fn<T> = () => Promise<T>;

export function useAsyncRefreshMemo<T>(fn: Fn<T>, deps: DependencyList, initialValue: T): [T, () => void];
justjanne marked this conversation as resolved.
Show resolved Hide resolved
export function useAsyncRefreshMemo<T>(fn: Fn<T>, deps: DependencyList, initialValue?: T): [T | undefined, () => void];
export function useAsyncRefreshMemo<T>(fn: Fn<T>, deps: DependencyList, initialValue?: T): [T | undefined, () => void] {
const [value, setValue] = useState<T | undefined>(initialValue);
const refresh = useCallback(() => {
let discard = false;
fn()
.then((v) => {
if (!discard) {
setValue(v);
}
})
.catch((err) => console.error(err));
return () => {
discard = true;
};
}, deps); // eslint-disable-line react-hooks/exhaustive-deps
useEffect(refresh, [refresh]);
return [value, refresh];
}
81 changes: 81 additions & 0 deletions src/hooks/useNotificationSettings.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { IPushRules, MatrixClient } from "matrix-js-sdk/src/matrix";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { NotificationSettings } from "../models/notificationsettings/NotificationSettings";
import { PushRuleDiff } from "../models/notificationsettings/PushRuleDiff";
import { reconcileNotificationSettings } from "../models/notificationsettings/reconcileNotificationSettings";
import { toNotificationSettings } from "../models/notificationsettings/toNotificationSettings";

async function applyChanges(cli: MatrixClient, changes: PushRuleDiff): Promise<void> {
await Promise.all(changes.deleted.map((change) => cli.deletePushRule("global", change.kind, change.rule_id)));
await Promise.all(changes.added.map((change) => cli.addPushRule("global", change.kind, change.rule_id, change)));
await Promise.all(
robintown marked this conversation as resolved.
Show resolved Hide resolved
changes.updated.map(async (change) => {
if (change.enabled !== undefined) {
await cli.setPushRuleEnabled("global", change.kind, change.rule_id, change.enabled);
}
if (change.actions !== undefined) {
await cli.setPushRuleActions("global", change.kind, change.rule_id, change.actions);
}
}),
);
}

type UseNotificationSettings = {
model: NotificationSettings | null;
hasPendingChanges: boolean;
reconcile: (model: NotificationSettings) => void;
};

export function useNotificationSettings(cli: MatrixClient): UseNotificationSettings {
const supportsIntentionalMentions = useMemo(() => cli.supportsIntentionalMentions(), [cli]);

const pushRules = useRef<IPushRules | null>(null);
const [model, setModel] = useState<NotificationSettings | null>(null);
const [hasPendingChanges, setPendingChanges] = useState<boolean>(false);
const updatePushRules = useCallback(async () => {
const rules = await cli.getPushRules();
const model = toNotificationSettings(rules, supportsIntentionalMentions);
const pendingChanges = reconcileNotificationSettings(rules, model, supportsIntentionalMentions);
pushRules.current = rules;
setPendingChanges(
pendingChanges.updated.length > 0 || pendingChanges.added.length > 0 || pendingChanges.deleted.length > 0,
);
setModel(model);
}, [cli, supportsIntentionalMentions]);

useEffect(() => {
updatePushRules().catch((err) => console.error(err));
}, [cli, updatePushRules]);

const reconcile = useCallback(
(model: NotificationSettings) => {
if (pushRules.current !== null) {
setModel(model);
const changes = reconcileNotificationSettings(pushRules.current, model, supportsIntentionalMentions);
applyChanges(cli, changes)
.then(updatePushRules)
.catch((err) => console.error(err));
}
},
[cli, updatePushRules, supportsIntentionalMentions],
);

return { model, hasPendingChanges, reconcile };
}
23 changes: 23 additions & 0 deletions src/hooks/usePushers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { IPusher, MatrixClient } from "matrix-js-sdk/src/matrix";

import { useAsyncRefreshMemo } from "./useAsyncRefreshMemo";

export function usePushers(client: MatrixClient): [IPusher[], () => void] {
return useAsyncRefreshMemo<IPusher[]>(() => client.getPushers().then((it) => it.pushers), [client], []);
}
24 changes: 24 additions & 0 deletions src/hooks/useThreepids.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { MatrixClient } from "matrix-js-sdk/src/matrix";
import { IThreepid } from "matrix-js-sdk/src/@types/threepids";

import { useAsyncRefreshMemo } from "./useAsyncRefreshMemo";

export function useThreepids(client: MatrixClient): [IThreepid[], () => void] {
return useAsyncRefreshMemo<IThreepid[]>(() => client.getThreePids().then((it) => it.threepids), [client], []);
}
67 changes: 67 additions & 0 deletions src/models/notificationsettings/NotificationSettings.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { RoomNotifState } from "../../RoomNotifs";

export type RoomDefaultNotificationLevel = RoomNotifState.AllMessages | RoomNotifState.MentionsOnly;

export type NotificationSettings = {
globalMute: boolean;
defaultLevels: {
room: RoomDefaultNotificationLevel;
dm: RoomDefaultNotificationLevel;
};
sound: {
people: string | undefined;
mentions: string | undefined;
calls: string | undefined;
};
activity: {
invite: boolean;
status_event: boolean;
bot_notices: boolean;
};
mentions: {
user: boolean;
keywords: boolean;
room: boolean;
};
keywords: string[];
};

export const DefaultNotificationSettings: NotificationSettings = {
globalMute: false,
defaultLevels: {
room: RoomNotifState.AllMessages,
dm: RoomNotifState.AllMessages,
},
sound: {
people: "default",
mentions: "default",
calls: "ring",
},
activity: {
invite: true,
status_event: false,
bot_notices: true,
},
mentions: {
user: true,
room: true,
keywords: true,
},
keywords: [],
};
35 changes: 35 additions & 0 deletions src/models/notificationsettings/PushRuleDiff.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { IAnnotatedPushRule, PushRuleAction, PushRuleKind, RuleId } from "matrix-js-sdk/src/matrix";

export type PushRuleDiff = {
updated: PushRuleUpdate[];
added: IAnnotatedPushRule[];
deleted: PushRuleDeletion[];
};

export type PushRuleDeletion = {
rule_id: RuleId | string;
kind: PushRuleKind;
};

export type PushRuleUpdate = {
rule_id: RuleId | string;
kind: PushRuleKind;
enabled?: boolean;
actions?: PushRuleAction[];
};
33 changes: 33 additions & 0 deletions src/models/notificationsettings/PushRuleMap.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { IAnnotatedPushRule, IPushRules, PushRuleKind, RuleId } from "matrix-js-sdk/src/matrix";

export type PushRuleMap = Map<RuleId | string, IAnnotatedPushRule>;

export function buildPushRuleMap(rulesets: IPushRules): PushRuleMap {
const rules = new Map<RuleId | string, IAnnotatedPushRule>();

for (const kind of Object.values(PushRuleKind)) {
for (const rule of rulesets.global[kind] ?? []) {
if (rule.rule_id.startsWith(".")) {
rules.set(rule.rule_id, { ...rule, kind });
}
}
}

return rules;
}
Loading