From fe71079a5e5e238275b5c20cf9717e19de07fa2d Mon Sep 17 00:00:00 2001 From: Fairy-Phy Date: Sun, 24 Dec 2023 03:01:55 +0900 Subject: [PATCH 1/4] add Disable note nyaize resolve #63 --- locales/en-US.yml | 1 + locales/index.d.ts | 1 + locales/ja-JP.yml | 1 + locales/ja-KS.yml | 1 + packages/frontend/src/components/MkPostForm.vue | 8 ++++++-- packages/frontend/src/components/global/MkMfm.ts | 2 +- packages/frontend/src/pages/settings/general.vue | 3 +++ packages/frontend/src/store.ts | 4 ++++ 8 files changed, 18 insertions(+), 3 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 875213657315..fee02753b4a1 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1342,6 +1342,7 @@ _bubbleGame: section1: "Adjust the position and drop the object into the box." section2: "When two objects of the same type touch each other, they will change into a different object and you score points." section3: "The game is over when objects overflow from the box. Aim for a high score by fusing objects together while you avoid overflowing the box!" +disableNoteNyaize: "Disable nyaize" _announcement: forExistingUsers: "Existing users only" forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it." diff --git a/locales/index.d.ts b/locales/index.d.ts index 82497f67035f..6758695dfc64 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5423,6 +5423,7 @@ export interface Locale extends ILocale { "section3": string; }; }; + "disableNoteNyaize": string; "_announcement": { /** * 既存ユーザーのみ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 1c07c69f444a..beb17908efa3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1357,6 +1357,7 @@ _bubbleGame: section1: "位置を調整してハコにモノを落とします。" section2: "同じ種類のモノがくっつくと別のモノに変化して、スコアが得られます。" section3: "モノがハコからあふれるとゲームオーバーです。ハコからあふれないようにしつつモノを融合させてハイスコアを目指そう！" +disableNoteNyaize: "nayizeを無効化する" _announcement: forExistingUsers: "既存ユーザーのみ" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 898fc16ce29f..dc5f09528391 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -1297,6 +1297,7 @@ _bubbleGame: section1: "位置を調整してハコにモノを落とすで。" section2: "同じもんがくっついたら別のやつになって、スコアがもらえるで。" section3: "モノがハコからあふれたらゲームオーバーや。ハコからあふれんようにしながらモノを融合させてハイスコアを目指しいや！" +disableNoteNyaize: "nayizeしなくする" _announcement: forExistingUsers: "もうおるユーザーのみ" forExistingUsersDescription: "オンにしたらこのお知らせができた時点でおる人らにだけお知らせが行くで。切ったらこの知らせが行ったあとにアカウント作った人にもちゃんとお知らせが行くで。" diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index eb7b6b93ba49..8163027d5db9 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only @drop.stop="onDrop" >
-
+
@@ -384,6 +386,7 @@ const keepScreenOn = computed(defaultStore.makeGetterSetter('keepScreenOn')); const disableStreamingTimeline = computed(defaultStore.makeGetterSetter('disableStreamingTimeline')); const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroupedNotifications')); const enableSeasonalScreenEffect = computed(defaultStore.makeGetterSetter('enableSeasonalScreenEffect')); +const disableNoteNyaize = computed(defaultStore.makeGetterSetter('disableNoteNyaize')); const enableHorizontalSwipe = computed(defaultStore.makeGetterSetter('enableHorizontalSwipe')); const useNativeUIForVideoAudioPlayer = computed(defaultStore.makeGetterSetter('useNativeUIForVideoAudioPlayer')); const alwaysConfirmFollow = computed(defaultStore.makeGetterSetter('alwaysConfirmFollow')); diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 9def12dc47fb..d86b2694ff1c 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -526,6 +526,10 @@ export const defaultStore = markRaw(new Storage('base', { where: 'device', default: 'app' as 'app' | 'appWithShift' | 'native', }, + disableNoteNyaize: { + where: 'device', + default: false, + }, hideLocalTimeLine: { where: 'device', default: false, From ca4e140d79b45193c7bc81010b49f07aa4e0649b Mon Sep 17 00:00:00 2001 From: mai <74494945+chan-mai@users.noreply.github.com> Date: Sun, 10 Nov 2024 12:50:07 +0000 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E3=83=90=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=81=AB=E8=A8=AD=E5=AE=9A=E5=80=A4?= =?UTF-8?q?=E3=82=92=E5=90=AB=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/settings/preferences-backups.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue index 336af73e8a30..b1a75f50bfa4 100644 --- a/packages/frontend/src/pages/settings/preferences-backups.vue +++ b/packages/frontend/src/pages/settings/preferences-backups.vue @@ -124,6 +124,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [ 'hiddenPinnedNotes', 'hiddenActivity', 'hiddenFiles', + 'disableNoteNyaize', ]; const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [ 'lightTheme', From 7b9a73692a5438396a0b6c32107cd8a9f144840e Mon Sep 17 00:00:00 2001 From: mai <74494945+chan-mai@users.noreply.github.com> Date: Sun, 10 Nov 2024 12:52:56 +0000 Subject: [PATCH 3/4] =?UTF-8?q?update:=20=E6=BC=8F=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/index.d.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/index.d.ts b/locales/index.d.ts index 6758695dfc64..6459b9a56dad 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5423,6 +5423,9 @@ export interface Locale extends ILocale { "section3": string; }; }; + /** + * nayizeを無効化する + */ "disableNoteNyaize": string; "_announcement": { /** From dd1a2b240effd304834875f9a8ca5cb557d2815a Mon Sep 17 00:00:00 2001 From: mai <74494945+chan-mai@users.noreply.github.com> Date: Sun, 10 Nov 2024 12:54:39 +0000 Subject: [PATCH 4/4] =?UTF-8?q?docs:=20=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3bd19dec7ba8..31cdde5d57b6 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ - 任意のTLを非表示にできるように https://github.com/team-shahu/misskey/pull/36 - プロフィールからアクティビティとファイルを隠せるようにする https://github.com/team-shahu/misskey/pull/37 - フォローしているユーザーなら鍵ノートでもアンテナにひっかかるように https://github.com/team-shahu/misskey/pull/38 +- nyaizeを無効化できるように https://github.com/team-shahu/misskey/pull/39 ## Special Thanks - [Misskey](https://github.com/misskey-dev/misskey)