From f28923f86f7e3b61c92e4351cac95a96d8692f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Mon, 26 Dec 2022 10:13:59 +0100
Subject: [PATCH] fix: request push notifications on mobile (#553)

---
 ...NotificationEnablePushNotification.client.vue |  2 +-
 composables/push-notifications/usePushManager.ts | 16 ++++++++--------
 service-worker/web-push-notifications.ts         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/components/notification/NotificationEnablePushNotification.client.vue b/components/notification/NotificationEnablePushNotification.client.vue
index ca60eeecc..88bd781a0 100644
--- a/components/notification/NotificationEnablePushNotification.client.vue
+++ b/components/notification/NotificationEnablePushNotification.client.vue
@@ -36,7 +36,7 @@ const isLegacyAccount = computed(() => !currentUser.value?.vapidKey)
     <button
       btn-outline rounded-full font-bold py4 flex="~ gap2 center" m5
       type="button"
-      :class="busy ? 'border-transparent' : null"
+      :class="busy || isLegacyAccount ? 'border-transparent' : null"
       :disabled="busy || isLegacyAccount"
       @click="$emit('subscribe')"
     >
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index 30d702417..94f1b9634 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -74,14 +74,14 @@ export const usePushManager = () => {
 
     if (!notificationPermission.value || (notificationPermission.value === 'prompt' && !hiddenNotification.value[acct])) {
       // safari 16 does not support navigator.permissions.query for notifications
-      try {
-        permission = (await navigator.permissions?.query({ name: 'notifications' }))?.state
-      }
-      catch {
-        permission = await Promise.resolve(Notification.requestPermission()).then((p: NotificationPermission) => {
-          return p === 'default' ? 'prompt' : p
-        })
-      }
+      // try {
+      //   permission = (await navigator.permissions?.query({ name: 'notifications' }))?.state
+      // }
+      // catch {
+      permission = await Promise.resolve(Notification.requestPermission()).then((p: NotificationPermission) => {
+        return p === 'default' ? 'prompt' : p
+      })
+      // }
     }
     else {
       permission = notificationPermission.value
diff --git a/service-worker/web-push-notifications.ts b/service-worker/web-push-notifications.ts
index 18e66d9a4..36a302be0 100644
--- a/service-worker/web-push-notifications.ts
+++ b/service-worker/web-push-notifications.ts
@@ -43,7 +43,7 @@ export const onPush = (event: PushEvent) => {
       icon,
       lang: preferred_locale,
       tag: notification_id,
-      timestamp: new Date().getUTCDate(),
+      timestamp: new Date().getTime(),
     }
     return self.registration.showNotification(options.title, notificationOptions)
   })