From e6112506df73a8a38bb8b5a1fee5dd3149e989aa Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 29 Dec 2022 17:20:24 +0900
Subject: 通知設定が開けないのを修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MkPushNotificationAllowButton.vue   | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'packages/frontend/src/components/MkPushNotificationAllowButton.vue')

diff --git a/packages/frontend/src/components/MkPushNotificationAllowButton.vue b/packages/frontend/src/components/MkPushNotificationAllowButton.vue
index b356fd3b89..b98c814f24 100644
--- a/packages/frontend/src/components/MkPushNotificationAllowButton.vue
+++ b/packages/frontend/src/components/MkPushNotificationAllowButton.vue
@@ -126,7 +126,7 @@ function encode(buffer: ArrayBuffer | null) {
  * Convert the URL safe base64 string to a Uint8Array
  * @param base64String base64 string
  */
- function urlBase64ToUint8Array(base64String: string): Uint8Array {
+function urlBase64ToUint8Array(base64String: string): Uint8Array {
 	const padding = '='.repeat((4 - base64String.length % 4) % 4);
 	const base64 = (base64String + padding)
 		.replace(/-/g, '+')
@@ -141,25 +141,29 @@ function encode(buffer: ArrayBuffer | null) {
 	return outputArray;
 }
 
-navigator.serviceWorker.ready.then(async swr => {
-	registration = swr;
+if (navigator.serviceWorker == null) {
+	// TODO: よしなに？
+} else {
+	navigator.serviceWorker.ready.then(async swr => {
+		registration = swr;
 
-	pushSubscription = await registration.pushManager.getSubscription();
+		pushSubscription = await registration.pushManager.getSubscription();
 
-	if (instance.swPublickey && ('PushManager' in window) && $i && $i.token) {
-		supported = true;
+		if (instance.swPublickey && ('PushManager' in window) && $i && $i.token) {
+			supported = true;
 
-		if (pushSubscription) {
-			const res = await api('sw/show-registration', {
-				endpoint: pushSubscription.endpoint,
-			});
+			if (pushSubscription) {
+				const res = await api('sw/show-registration', {
+					endpoint: pushSubscription.endpoint,
+				});
 
-			if (res) {
-				pushRegistrationInServer = res;
+				if (res) {
+					pushRegistrationInServer = res;
+				}
 			}
 		}
-	}
-});
+	});
+}
 
 defineExpose({
 	pushRegistrationInServer: $$(pushRegistrationInServer),
-- 
cgit v1.2.3-freya

