Merge notification filter preferences

This commit is contained in:
Blendman974 committed 2026-11-06 00:05:58 +01:00
commit de318a7714
4 files changed
+135 -12

No files matched your search

+30 -5
View File
@@ -1,6 +1,16 @@
import { getStringSetting, setStringSetting } from "./settings-store";
const SOURCES_KEY = "notifications.sources";
const DEFAULT_KEY = "notifications.newAppsEnabledByDefault";
/** Unset preserves the behavior of existing installations. */
export function newNotificationAppsEnabledByDefault(): boolean {
return getStringSetting(DEFAULT_KEY, "true") !== "false";
}
export function setNewNotificationAppsEnabledByDefault(enabled: boolean): void {
setStringSetting(DEFAULT_KEY, String(enabled));
}
export type NotificationSource = {
packageName: string;
@@ -8,8 +18,15 @@ export type NotificationSource = {
showOnGlasses: boolean;
};
type SavedSource = Omit<NotificationSource, "showOnGlasses"> & { showOnGlasses?: boolean };
/** Sources outlive their active notifications so a muted app can always be re-enabled. */
export function readNotificationSources(): NotificationSource[] {
const enabled = newNotificationAppsEnabledByDefault();
return readSavedSources().map((source) => ({ ...source, showOnGlasses: source.showOnGlasses ?? enabled }));
}
function readSavedSources(): SavedSource[] {
try {
const parsed = JSON.parse(getStringSetting(SOURCES_KEY, "[]"));
if (!Array.isArray(parsed)) return [];
@@ -17,7 +34,7 @@ export function readNotificationSources(): NotificationSource[] {
.map((source) => ({
packageName: source.packageName,
appName: typeof source.appName === "string" && source.appName ? source.appName : source.packageName,
showOnGlasses: source.showOnGlasses !== false,
showOnGlasses: typeof source.showOnGlasses === "boolean" ? source.showOnGlasses : undefined,
}));
} catch {
return [];
@@ -25,7 +42,7 @@ export function readNotificationSources(): NotificationSource[] {
}
export function rememberNotificationSources(notifications: { packageName: string; appName: string }[]): void {
const sources = new Map(readNotificationSources().map((source) => [source.packageName, source]));
const sources = new Map(readSavedSources().map((source) => [source.packageName, source]));
let changed = false;
for (const notification of notifications) {
if (!notification.packageName) continue;
@@ -35,7 +52,7 @@ export function rememberNotificationSources(notifications: { packageName: string
sources.set(notification.packageName, {
packageName: notification.packageName,
appName,
showOnGlasses: previous?.showOnGlasses ?? true,
showOnGlasses: previous?.showOnGlasses,
});
changed = true;
}
@@ -44,12 +61,13 @@ export function rememberNotificationSources(notifications: { packageName: string
}
export function shouldShowNotificationOnGlasses(packageName: string): boolean {
return readNotificationSources().find((source) => source.packageName === packageName)?.showOnGlasses ?? true;
return readNotificationSources().find((source) => source.packageName === packageName)?.showOnGlasses
?? newNotificationAppsEnabledByDefault();
}
export function setNotificationSourceEnabled(source: { packageName: string; appName: string }, enabled: boolean): void {
if (!source.packageName) return;
const sources = new Map(readNotificationSources().map((item) => [item.packageName, item]));
const sources = new Map(readSavedSources().map((item) => [item.packageName, item]));
sources.set(source.packageName, {
packageName: source.packageName,
appName: source.appName || source.packageName,
@@ -57,3 +75,10 @@ export function setNotificationSourceEnabled(source: { packageName: string; appN
});
setStringSetting(SOURCES_KEY, JSON.stringify(Array.from(sources.values())));
}
/** Set explicit choices only for sources already discovered; leave the future default alone. */
export function setAllNotificationSourcesEnabled(enabled: boolean): void {
setStringSetting(SOURCES_KEY, JSON.stringify(readSavedSources().map((source) => ({
...source, showOnGlasses: enabled,
}))));
}