From f9fc743c0581cc3043cb0ff4ffb137113d7797b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 19:42:42 +0900 Subject: [PATCH 01/13] build(deps): bump tibdex/github-app-token from 1 to 2 (#11815) Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1 to 2. - [Release notes](https://github.com/tibdex/github-app-token/releases) - [Commits](https://github.com/tibdex/github-app-token/compare/v1...v2) --- updated-dependencies: - dependency-name: tibdex/github-app-token dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ok-to-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ok-to-test.yml b/.github/workflows/ok-to-test.yml index 71d09f7814..c02b980e4d 100644 --- a/.github/workflows/ok-to-test.yml +++ b/.github/workflows/ok-to-test.yml @@ -17,7 +17,7 @@ jobs: # See app.yml for an example app manifest - name: Generate token id: generate_token - uses: tibdex/github-app-token@v1 + uses: tibdex/github-app-token@v2 with: app_id: ${{ secrets.DEPLOYBOT_APP_ID }} private_key: ${{ secrets.DEPLOYBOT_PRIVATE_KEY }} From 42c7aad251e1ddce52a8ea04eedfe59fce27b4fc Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 12 Sep 2023 15:38:00 +0900 Subject: [PATCH 02/13] enhance(backend): configure ratelimit for notification creation apis --- .../backend/src/server/api/endpoints/notifications/create.ts | 5 +++++ .../server/api/endpoints/notifications/test-notification.ts | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packages/backend/src/server/api/endpoints/notifications/create.ts b/packages/backend/src/server/api/endpoints/notifications/create.ts index 020fc2d3df..268628cf76 100644 --- a/packages/backend/src/server/api/endpoints/notifications/create.ts +++ b/packages/backend/src/server/api/endpoints/notifications/create.ts @@ -14,6 +14,11 @@ export const meta = { kind: 'write:notifications', + limit: { + duration: 1000 * 60, + max: 10, + }, + errors: { }, } as const; diff --git a/packages/backend/src/server/api/endpoints/notifications/test-notification.ts b/packages/backend/src/server/api/endpoints/notifications/test-notification.ts index 04a68a8054..8f5f8485c3 100644 --- a/packages/backend/src/server/api/endpoints/notifications/test-notification.ts +++ b/packages/backend/src/server/api/endpoints/notifications/test-notification.ts @@ -13,6 +13,11 @@ export const meta = { requireCredential: true, kind: 'write:notifications', + + limit: { + duration: 1000 * 60, + max: 10, + }, } as const; export const paramDef = { From 3456680e1d827bada1009aad7a7247ae17f01184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:48:19 +0900 Subject: [PATCH 03/13] =?UTF-8?q?=E6=96=B0=E3=81=97=E3=81=84=E5=AE=9F?= =?UTF-8?q?=E7=B8=BE=E3=82=92=E8=BF=BD=E5=8A=A0=20(#11817)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (add) new achievement * (update) changelog * Update test-notification.ts * tweak --------- Co-authored-by: syuilo --- CHANGELOG.md | 3 +- locales/index.d.ts | 4 +++ locales/ja-JP.yml | 3 ++ .../backend/src/core/AchievementService.ts | 1 + .../frontend/src/pages/settings/general.vue | 32 +++++++++++++++-- .../src/pages/settings/notifications.vue | 7 ++-- packages/frontend/src/scripts/achievements.ts | 6 ++++ .../frontend/src/scripts/test-notification.ts | 34 ------------------- 8 files changed, 51 insertions(+), 39 deletions(-) delete mode 100644 packages/frontend/src/scripts/test-notification.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 03c93f70df..1cc6b3f0d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - センシティブチャンネルのノートはユーザープロフィールに表示されません - 二要素認証のバックアップコードが生成されるようになりました ref. https://github.com/MisskeyIO/misskey/pull/121 - 二要素認証でパスキーをサポートするようになりました +- 通知をテストできるようになりました ### Client - プロフィールにその人が作ったPlayの一覧出せるように @@ -33,7 +34,6 @@ - 投稿フォームのプレビューの表示状態を記憶するように - AiScriptからMisskeyサーバーAPIを呼び出す際の制限を撤廃 - Playで直接投稿フォームを埋め込めるように(`Ui:C:postForm`) -- 通知をテストできるように - Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように - Enhance: 自分が押したリアクションのデザインを改善 - Enhance: ノート検索にローカルのみ検索可能なオプションの追加 @@ -46,6 +46,7 @@ - リアクションの表示サイズをより大きくできるように - ノート詳細ページ読み込み時のパフォーマンスを改善 - タイムラインでリスト/アンテナ選択時のパフォーマンスを改善 +- 新しい実績を追加 - Fix: サーバー情報画面(`/instance-info/{domain}`)でブロックができないのを修正 - Fix: 未読のお知らせの「わかった」をクリック・タップしてもその場で「わかった」が消えない問題を修正 - Fix: iOSで画面を回転させるとテキストサイズが変わる問題を修正 diff --git a/locales/index.d.ts b/locales/index.d.ts index 36897285c4..746c51c991 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1467,6 +1467,10 @@ export interface Locale { "description": string; "flavor": string; }; + "_smashTestNotificationButton": { + "title": string; + "description": string; + }; }; }; "_role": { diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f9427e13ec..3cde23ca91 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1391,6 +1391,9 @@ _achievements: title: "Brain Diver" description: "Brain Diverへのリンクを投稿した" flavor: "Misskey-Misskey La-Tu-Ma" + _smashTestNotificationButton: + title: "テスト過剰" + description: "通知のテストをごく短時間のうちに連続して行った" _role: new: "ロールの作成" diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts index aa810015ed..a35acd3680 100644 --- a/packages/backend/src/core/AchievementService.ts +++ b/packages/backend/src/core/AchievementService.ts @@ -85,6 +85,7 @@ export const ACHIEVEMENT_TYPES = [ 'setNameToSyuilo', 'cookieClicked', 'brainDiver', + 'smashTestNotificationButton', ] as const; @Injectable() 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 - {{ i18n.ts._notification.checkNotificationBehavior }} + {{ i18n.ts._notification.checkNotificationBehavior }} @@ -176,6 +176,7 @@ SPDX-License-Identifier: AGPL-3.0-only