From 94fb23ba1727c17373560da12dc464f4592056b9 Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Sun, 25 Jun 2023 21:10:25 -0400 Subject: [PATCH] Style changes --- web/src/app/SubscriptionManager.js | 2 -- web/src/app/WebPush.js | 6 +++--- web/src/components/hooks.js | 7 +++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/src/app/SubscriptionManager.js b/web/src/app/SubscriptionManager.js index c68a198c..28beb455 100644 --- a/web/src/app/SubscriptionManager.js +++ b/web/src/app/SubscriptionManager.js @@ -122,9 +122,7 @@ class SubscriptionManager { async updateWebPushSubscriptions(presetTopics) { const topics = presetTopics ?? (await this.webPushTopics()); - const hasWebPushTopics = topics.length > 0; - const browserSubscription = await notifier.webPushSubscription(hasWebPushTopics); if (!browserSubscription) { diff --git a/web/src/app/WebPush.js b/web/src/app/WebPush.js index 1e979239..58ab95d8 100644 --- a/web/src/app/WebPush.js +++ b/web/src/app/WebPush.js @@ -6,7 +6,7 @@ const broadcastChannel = new BroadcastChannel("web-push-broadcast"); /** * Updates the Web Push subscriptions when the list of topics changes, - * as well as plays a sound when a new broadcat message is received from + * as well as plays a sound when a new broadcast message is received from * the service worker, since the service worker cannot play sounds. */ const useWebPushListener = (topics) => { @@ -20,11 +20,11 @@ const useWebPushListener = (topics) => { (async () => { try { - console.log("[useWebPushTopicListener] Refreshing web push subscriptions", topics); + console.log("[useWebPushListener] Refreshing web push subscriptions", topics); await subscriptionManager.updateWebPushSubscriptions(topics); setLastTopics(topics); } catch (e) { - console.error("[useWebPushTopicListener] Error refreshing web push subscriptions", e); + console.error("[useWebPushListener] Error refreshing web push subscriptions", e); } })(); }, [topics, lastTopics]); diff --git a/web/src/components/hooks.js b/web/src/components/hooks.js index e065c2c2..11bdcd76 100644 --- a/web/src/components/hooks.js +++ b/web/src/components/hooks.js @@ -136,9 +136,12 @@ export const useAutoSubscribe = (subscriptions, selected) => { }, [params, subscriptions, selected, hasRun]); }; +/** + * Watches the "display-mode" to detect if the app is running as a standalone app (PWA), + * and enables "Web Push" if it is. + */ export const useStandaloneAutoWebPushSubscribe = () => { const matchMedia = window.matchMedia("(display-mode: standalone)"); - const [isStandalone, setIsStandalone] = useState(isLaunchedPWA()); useEffect(() => { @@ -157,7 +160,7 @@ export const useStandaloneAutoWebPushSubscribe = () => { useEffect(() => { if (isStandalone) { console.log(`[useStandaloneAutoWebPushSubscribe] Turning on web push automatically`); - prefs.setWebPushEnabled(true); + prefs.setWebPushEnabled(true); // Dangle! } }, [isStandalone]); };