From 635fde3668aa2b8bfe3069c9425cf37c594706c7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 12 Sep 2023 15:48:02 +0900
Subject: [PATCH] tweak

---
 locales/index.d.ts                            |  1 -
 locales/ja-JP.yml                             |  5 +-
 .../frontend/src/pages/settings/general.vue   | 32 +++++++++++-
 .../src/pages/settings/notifications.vue      |  7 ++-
 .../frontend/src/scripts/test-notification.ts | 51 -------------------
 5 files changed, 37 insertions(+), 59 deletions(-)
 delete mode 100644 packages/frontend/src/scripts/test-notification.ts

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 6397719d6c..746c51c991 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1470,7 +1470,6 @@ export interface Locale {
             "_smashTestNotificationButton": {
                 "title": string;
                 "description": string;
-                "flavor": string;
             };
         };
     };
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 2f6c6ba13d..3cde23ca91 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1392,9 +1392,8 @@ _achievements:
       description: "Brain Diverへのリンクを投稿した"
       flavor: "Misskey-Misskey La-Tu-Ma"
     _smashTestNotificationButton:
-      title: "セルフ通知破壊"
-      description: "通知テストを連打した"
-      flavor: "ほどほどにしておきましょう"
+      title: "テスト過剰"
+      description: "通知のテストをごく短時間のうちに連続して行った"
 
 _role:
   new: "ロールの作成"
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 31d5dd93ec..b486e6d80f 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -96,7 +96,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="horizontal"><i class="ti ti-carousel-horizontal"></i> {{ i18n.ts.horizontal }}</option>
 			</MkRadios>
 
-			<MkButton @click="testNotification('client')">{{ i18n.ts._notification.checkNotificationBehavior }}</MkButton>
+			<MkButton @click="testNotification">{{ i18n.ts._notification.checkNotificationBehavior }}</MkButton>
 		</div>
 	</FormSection>
 
@@ -176,6 +176,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, ref, watch } from 'vue';
+import * as Misskey from 'misskey-js';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import MkRadios from '@/components/MkRadios.vue';
@@ -192,7 +193,8 @@ import { unisonReload } from '@/scripts/unison-reload';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import { miLocalStorage } from '@/local-storage';
-import { testNotification } from '@/scripts/test-notification';
+import { globalEvents } from '@/events';
+import { claimAchievement } from '@/scripts/achievements';
 
 const lang = ref(miLocalStorage.getItem('lang'));
 const fontSize = ref(miLocalStorage.getItem('fontSize'));
@@ -305,6 +307,32 @@ function removeEmojiIndex(lang: string) {
 	os.promiseDialog(main());
 }
 
+let smashCount = 0;
+let smashTimer: number | null = null;
+function testNotification(): void {
+	const notification: Misskey.entities.Notification = {
+		id: Math.random().toString(),
+		createdAt: new Date().toUTCString(),
+		isRead: false,
+		type: 'test',
+	};
+
+	globalEvents.emit('clientNotification', notification);
+
+	// セルフ通知破壊 実績関連
+	smashCount++;
+	if (smashCount >= 10) {
+		claimAchievement('smashTestNotificationButton');
+		smashCount = 0;
+	}
+	if (smashTimer) {
+		clearTimeout(smashTimer);
+	}
+	smashTimer = window.setTimeout(() => {
+		smashCount = 0;
+	}, 300);
+}
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue
index b20add724c..193795cdec 100644
--- a/packages/frontend/src/pages/settings/notifications.vue
+++ b/packages/frontend/src/pages/settings/notifications.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</FormSection>
 	<FormSection>
 		<div class="_gaps_m">
-			<FormLink @click="testNotification('server')">{{ i18n.ts._notification.sendTestNotification }}</FormLink>
+			<FormLink @click="testNotification">{{ i18n.ts._notification.sendTestNotification }}</FormLink>
 		</div>
 	</FormSection>
 	<FormSection>
@@ -46,7 +46,6 @@ import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
 import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
 import { notificationTypes } from '@/const';
-import { testNotification } from '@/scripts/test-notification';
 
 let allowButton = $shallowRef<InstanceType<typeof MkPushNotificationAllowButton>>();
 let pushRegistrationInServer = $computed(() => allowButton?.pushRegistrationInServer);
@@ -89,6 +88,10 @@ function onChangeSendReadMessage(v: boolean) {
 	});
 }
 
+function testNotification(): void {
+	os.api('notifications/test-notification');
+}
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
diff --git a/packages/frontend/src/scripts/test-notification.ts b/packages/frontend/src/scripts/test-notification.ts
deleted file mode 100644
index e1a7d59d30..0000000000
--- a/packages/frontend/src/scripts/test-notification.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import * as Misskey from 'misskey-js';
-import * as os from '@/os';
-import { globalEvents } from '@/events';
-import { claimAchievement } from '@/scripts/achievements';
-
-let smashCount = 0;
-let smashTimer: number | null = null;
-
-/**
- * テスト通知を送信
- * 
- * - `client` … 通知ポップアップのみを表示
- * - `server` … サーバー側から通知を送信
- * 
- * @param type 通知タイプを指定
- */
-export function testNotification(type: 'client' | 'server'): void {
-	const notification: Misskey.entities.Notification = {
-		id: Math.random().toString(),
-		createdAt: new Date().toUTCString(),
-		isRead: false,
-		type: 'test',
-	};
-
-	switch (type) {
-		case 'server':
-			os.api('notifications/test-notification');
-			break;
-		case 'client':
-			globalEvents.emit('clientNotification', notification);
-			break;
-	}
-
-	// セルフ通知破壊 実績関連
-	smashCount++;
-	if (smashCount >= 10) {
-		claimAchievement('smashTestNotificationButton');
-		smashCount = 0;
-	}
-	if (smashTimer) {
-		clearTimeout(smashTimer);
-	}
-	smashTimer = window.setTimeout(() => {
-		smashCount = 0;
-	}, 300);
-}