From 36170a11f5b889cae3feda6bd4c666aafee98fef Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 18 Feb 2023 05:16:34 +0000
Subject: [PATCH] refactor(sw): self => globalThis
---
packages/sw/src/scripts/create-notification.ts | 8 ++++----
packages/sw/src/scripts/operations.ts | 4 ++--
packages/sw/src/sw.ts | 14 +++++++-------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts
index c121b30bef..e45c3f504c 100644
--- a/packages/sw/src/scripts/create-notification.ts
+++ b/packages/sw/src/scripts/create-notification.ts
@@ -23,7 +23,7 @@ export async function createNotification<K extends keyof pushNotificationDataMap
const n = await composeNotification(data);
if (n) {
- return self.registration.showNotification(...n);
+ return globalThis.registration.showNotification(...n);
} else {
console.error('Could not compose notification', data);
return createEmptyNotification();
@@ -239,7 +239,7 @@ export async function createEmptyNotification() {
const i18n = await swLang.i18n as I18n<any>;
const { t } = i18n;
- await self.registration.showNotification(
+ await globalThis.registration.showNotification(
t('_notification.emptyPushNotificationMessage'),
{
silent: true,
@@ -253,8 +253,8 @@ export async function createEmptyNotification() {
setTimeout(async () => {
for (const n of
[
- ...(await self.registration.getNotifications({ tag: 'user_visible_auto_notification' })),
- ...(await self.registration.getNotifications({ tag: 'read_notification' })),
+ ...(await globalThis.registration.getNotifications({ tag: 'user_visible_auto_notification' })),
+ ...(await globalThis.registration.getNotifications({ tag: 'read_notification' })),
]
) {
n.close();
diff --git a/packages/sw/src/scripts/operations.ts b/packages/sw/src/scripts/operations.ts
index 4d693223b2..8936a7763a 100644
--- a/packages/sw/src/scripts/operations.ts
+++ b/packages/sw/src/scripts/operations.ts
@@ -51,11 +51,11 @@ export async function openClient(order: swMessageOrderType, url: string, loginId
return client;
}
- return self.clients.openWindow(getUrlWithLoginId(url, loginId));
+ return globalThis.clients.openWindow(getUrlWithLoginId(url, loginId));
}
export async function findClient() {
- const clients = await self.clients.matchAll({
+ const clients = await globalThis.clients.matchAll({
type: 'window',
});
for (const c of clients) {
diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index c392d03232..f4d7685470 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -6,7 +6,7 @@ import * as swos from '@/scripts/operations';
import { acct as getAcct } from '@/filters/user';
globalThis.addEventListener('install', ev => {
- //ev.waitUntil(self.skipWaiting());
+ //ev.waitUntil(globalThis.skipWaiting());
});
globalThis.addEventListener('activate', ev => {
@@ -17,7 +17,7 @@ globalThis.addEventListener('activate', ev => {
.filter((v) => v !== swLang.cacheName)
.map(name => caches.delete(name)),
))
- .then(() => self.clients.claim()),
+ .then(() => globalThis.clients.claim()),
);
});
@@ -40,7 +40,7 @@ globalThis.addEventListener('fetch', ev => {
globalThis.addEventListener('push', ev => {
// クライアント取得
- ev.waitUntil(self.clients.matchAll({
+ ev.waitUntil(globalThis.clients.matchAll({
includeUncontrolled: true,
type: 'window',
}).then(async (clients: readonly WindowClient[]) => {
@@ -58,24 +58,24 @@ globalThis.addEventListener('push', ev => {
return createNotification(data);
case 'readAllNotifications':
- for (const n of await self.registration.getNotifications()) {
+ for (const n of await globalThis.registration.getNotifications()) {
if (n?.data?.type === 'notification') n.close();
}
break;
case 'readAllAntennas':
- for (const n of await self.registration.getNotifications()) {
+ for (const n of await globalThis.registration.getNotifications()) {
if (n?.data?.type === 'unreadAntennaNote') n.close();
}
break;
case 'readNotifications':
- for (const n of await self.registration.getNotifications()) {
+ for (const n of await globalThis.registration.getNotifications()) {
if (data.body.notificationIds.includes(n.data.body.id)) {
n.close();
}
}
break;
case 'readAntenna':
- for (const n of await self.registration.getNotifications()) {
+ for (const n of await globalThis.registration.getNotifications()) {
if (n?.data?.type === 'unreadAntennaNote' && data.body.antennaId === n.data.body.antenna.id) {
n.close();
}