This repository was archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 820
Implement new model, hooks and reconcilation code for new GYU notification settings #11089
Merged
justjanne
merged 10 commits into
develop
from
justjanne/feat/new-notification-settings-model
Jun 17, 2023
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ad47035
Define new notification settings model
justjanne 5ff8d4b
Add new hooks
justjanne 07f77ea
make ts-strict happy
justjanne 9978f8e
add unit tests
justjanne 3629265
chore: make eslint/prettier happier :)
justjanne ba34424
make ts-strict happier
justjanne 69c1ad4
Update src/notifications/NotificationUtils.ts
justjanne c7ab10b
Add tests for hooks
justjanne 2ee41fc
chore: fixed lint issues
justjanne b0819ab
Add comments
justjanne File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
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>; | ||
|
||
/** | ||
* Works just like useMemo or our own useAsyncMemo, but additionally exposes a method to refresh the cached value | ||
* as if the dependency had changed | ||
* @param fn function to memoize | ||
* @param deps React hooks dependencies for the function | ||
* @param initialValue initial value | ||
* @return tuple of cached value and refresh callback | ||
*/ | ||
export function useAsyncRefreshMemo<T>(fn: Fn<T>, deps: DependencyList, initialValue: T): [T, () => void]; | ||
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]; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 }; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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], []); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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], []); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: [], | ||
}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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[]; | ||
}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.