natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

通知設定が開けないのを修正

This commit is contained in:
syuilo 2022-12-29 17:20:24 +09:00
parent 666c9be447
commit e6112506df
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/frontend/src/components/MkPushNotificationAllowButton.vue
View File

@ -126,7 +126,7 @@ function encode(buffer: ArrayBuffer | null) {
* Convert the URL safe base64 string to a Uint8Array * Convert the URL safe base64 string to a Uint8Array
* @param base64String base64 string * @param base64String base64 string
*/ */
function urlBase64ToUint8Array(base64String: string): Uint8Array { function urlBase64ToUint8Array(base64String: string): Uint8Array {
const padding = '='.repeat((4 - base64String.length % 4) % 4); const padding = '='.repeat((4 - base64String.length % 4) % 4);
const base64 = (base64String + padding) const base64 = (base64String + padding)
.replace(/-/g, '+') .replace(/-/g, '+')
@ -141,25 +141,29 @@ function encode(buffer: ArrayBuffer | null) {
return outputArray; return outputArray;
} }
navigator.serviceWorker.ready.then(async swr => { if (navigator.serviceWorker == null) {
registration = swr; // 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) { if (instance.swPublickey && ('PushManager' in window) && $i && $i.token) {
supported = true; supported = true;
if (pushSubscription) { if (pushSubscription) {
const res = await api('sw/show-registration', { const res = await api('sw/show-registration', {
endpoint: pushSubscription.endpoint, endpoint: pushSubscription.endpoint,
}); });
if (res) { if (res) {
pushRegistrationInServer = res; pushRegistrationInServer = res;
}
} }
} }
} });
}); }
defineExpose({ defineExpose({
pushRegistrationInServer: $$(pushRegistrationInServer), pushRegistrationInServer: $$(pushRegistrationInServer),