sw: なんかもうめっちゃ変えた (#10570)

* sw: なんかいろいろ

* remove debug code

* never renotify

* update changelog.md

packages/sw/src/scripts/create-notification.ts

@@ -21,7 +21,7 @@ const iconUrl = (name: BadgeNames) => `/static-assets/tabler-badges/${name}.png`
  * 1. Find the icon and download png from https://tabler-icons.io/
  * 2. vips resize ~/Downloads/icon-name.png vipswork.png 0.4; vips scRGB2BW vipswork.png ~/icon-name.png"[compression=9,strip]"; rm vipswork.png;
  * 3. mv ~/icon-name.png ~/misskey/packages/backend/assets/tabler-badges/
- * 4. Add 'icon-name' to badgeNames
+ * 4. Add 'icon-name' to BadgeNames
  * 5. Add `badge: iconUrl('icon-name'),`
  */
 
@@ -168,14 +168,6 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
 					}];
 				}
 
-				case 'pollEnded':
-					return [t('_notification.pollEnded'), {
-						body: data.body.note.text || '',
-						badge: iconUrl('chart-arrows'),
-						tag: `poll:${data.body.note.id}`,
-						data,
-					}];
-
 				case 'receiveFollowRequest':
 					return [t('_notification.youReceivedFollowRequest'), {
 						body: getUserName(data.body.user),
@@ -202,6 +194,14 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
 						data,
 					}];
 
+				case 'achievementEarned':
+					return [t('_notification.achievementEarned'), {
+						body: t(`_achievements._types._${data.body.achievement}.title`),
+						badge: iconUrl('medal'),
+						data,
+						tag: `achievement:${data.body.achievement}`,
+					}];
+
 				case 'app':
 					return [data.body.header ?? data.body.body, {
 						body: data.body.header ? data.body.body : '',
@@ -233,17 +233,29 @@ export async function createEmptyNotification() {
 		const { t } = i18n;
 
 		await globalThis.registration.showNotification(
-			t('_notification.emptyPushNotificationMessage'),
+			(new URL(origin)).host,
 			{
+				body: `Misskey v${_VERSION_}`,
 				silent: true,
 				badge: iconUrl('null'),
 				tag: 'read_notification',
+				actions: [
+					{
+						action: 'markAllAsRead',
+						title: t('markAllAsRead'),
+					},
+					{
+						action: 'settings',
+						title: t('notificationSettings'),
+					},
+				],
+				data: {},
 			},
 		);
 
 		setTimeout(async () => {
 			try {
-				await closeNotificationsByTags(['user_visible_auto_notification', 'read_notification']);
+				await closeNotificationsByTags(['user_visible_auto_notification']);
 			} finally {
 				res();
 			}

packages/sw/src/scripts/operations.ts

@@ -4,7 +4,6 @@
  */
 import * as Misskey from 'misskey-js';
 import { SwMessage, SwMessageOrderType } from '@/types';
-import { acct as getAcct } from '@/filters/user';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
 import { getUrlWithLoginId } from '@/scripts/login-id';
 
@@ -17,13 +16,27 @@ export async function api<E extends keyof Misskey.Endpoints>(endpoint: E, userId
 	return cli.request(endpoint, options, account.token);
 }
 
+// mark-all-as-read送出を1秒間隔に制限する
+const readBlockingStatus = new Map<string, boolean>();
+export function sendMarkAllAsRead(userId: string): Promise<null | undefined | void> {
+	if (readBlockingStatus.get(userId)) return Promise.resolve();
+	readBlockingStatus.set(userId, true);
+	return new Promise(resolve => {
+		setTimeout(() => {
+			readBlockingStatus.set(userId, false);
+			api('notifications/mark-all-as-read', userId)
+				.then(resolve, resolve);
+		}, 1000);
+	});
+}
+
 // rendered acctからユーザーを開く
-export function openUser(acct: string, loginId: string) {
+export function openUser(acct: string, loginId?: string) {
 	return openClient('push', `/@${acct}`, loginId, { acct });
 }
 
 // noteIdからノートを開く
-export function openNote(noteId: string, loginId: string) {
+export function openNote(noteId: string, loginId?: string) {
 	return openClient('push', `/notes/${noteId}`, loginId, { noteId });
 }
 
@@ -33,7 +46,7 @@ export function openAntenna(antennaId: string, loginId: string) {
 }
 
 // post-formのオプションから投稿フォームを開く
-export async function openPost(options: any, loginId: string) {
+export async function openPost(options: any, loginId?: string) {
 	// クエリを作成しておく
 	let url = '/share?';
 	if (options.initialText) url += `text=${options.initialText}&`;
@@ -43,7 +56,7 @@ export async function openPost(options: any, loginId: string) {
 	return openClient('post', url, loginId, { options });
 }
 
-export async function openClient(order: SwMessageOrderType, url: string, loginId: string, query: any = {}) {
+export async function openClient(order: SwMessageOrderType, url: string, loginId?: string, query: any = {}) {
 	const client = await findClient();
 
 	if (client) {
@@ -51,7 +64,7 @@ export async function openClient(order: SwMessageOrderType, url: string, loginId
 		return client;
 	}
 
-	return globalThis.clients.openWindow(getUrlWithLoginId(url, loginId));
+	return globalThis.clients.openWindow(loginId ? getUrlWithLoginId(url, loginId) : url);
 }
 
 export async function findClient() {
@@ -59,7 +72,7 @@ export async function findClient() {
 		type: 'window',
 	});
 	for (const c of clients) {
-		if (!new URL(c.url).searchParams.has('zen')) return c;
+		if (!(new URL(c.url)).searchParams.has('zen')) return c;
 	}
 	return null;
 }