From 4dc89f6bc5588945a8534da4ace08988437ab236 Mon Sep 17 00:00:00 2001
From: binwiederhier <philipp.heckel@gmail.com>
Date: Wed, 14 Jun 2023 13:31:34 -0400
Subject: [PATCH] Tiny fixes

---
 web/src/app/Notifier.js            | 10 ++++------
 web/src/app/SubscriptionManager.js |  9 +++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/web/src/app/Notifier.js b/web/src/app/Notifier.js
index 04d51281..7d71c326 100644
--- a/web/src/app/Notifier.js
+++ b/web/src/app/Notifier.js
@@ -48,7 +48,7 @@ class Notifier {
     }
   }
 
-  async getBrowserSubscription() {
+  async webPushSubscription() {
     if (!this.pushPossible()) {
       throw new Error("Unsupported or denied");
     }
@@ -58,11 +58,9 @@ class Notifier {
       return existingSubscription;
     }
 
-    // Create a new subscription only if web push is enabled.
-    // It is possible that web push was previously enabled and then disabled again
-    // in which case there would be an existingSubscription.
-    // but if it was _not_ enabled previously, we reach here, and only create a new
-    // subscription if it is now enabled.
+    // Create a new subscription only if Web Push is enabled. It is possible that Web Push
+    // was previously enabled and then disabled again in which case there would be an existingSubscription.
+    // If, however, it was _not_ enabled previously, we create a new subscription if it is now enabled.
 
     if (await this.pushEnabled()) {
       return pushManager.subscribe({
diff --git a/web/src/app/SubscriptionManager.js b/web/src/app/SubscriptionManager.js
index bb5207e7..8399c4fb 100644
--- a/web/src/app/SubscriptionManager.js
+++ b/web/src/app/SubscriptionManager.js
@@ -35,9 +35,7 @@ class SubscriptionManager {
       return [];
     }
     const subscriptions = await this.db.subscriptions.where({ baseUrl: config.base_url, mutedUntil: 0 }).toArray();
-    return subscriptions
-      .filter(({ internal }) => !internal)
-      .map(({ topic }) => topic);
+    return subscriptions.filter(({ internal }) => !internal).map(({ topic }) => topic);
   }
 
   async get(subscriptionId) {
@@ -46,8 +44,7 @@ class SubscriptionManager {
 
   async notify(subscriptionId, notification, defaultClickAction) {
     const subscription = await this.get(subscriptionId);
-
-    if (subscription.mutedUntil === 1) {
+    if (subscription.mutedUntil > 0) {
       return;
     }
 
@@ -120,7 +117,7 @@ class SubscriptionManager {
 
   async updateWebPushSubscriptions(presetTopics) {
     const topics = presetTopics ?? (await this.webPushTopics());
-    const browserSubscription = await notifier.getBrowserSubscription();
+    const browserSubscription = await notifier.webPushSubscription();
 
     if (!browserSubscription) {
       console.log("[SubscriptionManager] No browser subscription currently exists, so web push was never enabled. Skipping.");