diff --git a/locales/index.d.ts b/locales/index.d.ts index 888fd3870..262cc0b35 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -580,6 +580,14 @@ export interface Locale extends ILocale { * リノートのミュートを解除 */ "renoteUnmute": string; + /** + * リアクションのミュート + */ + "mutedReactions": string; + /** + * リモートの絵文字をミュート + */ + "remoteCustomEmojiMuted": string; /** * ブロック */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index e03a0d739..3ff82c457 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -141,6 +141,8 @@ mute: "ミュート" unmute: "ミュート解除" renoteMute: "リノートをミュート" renoteUnmute: "リノートのミュートを解除" +mutedReactions: "リアクションのミュート" +remoteCustomEmojiMuted: "リモートの絵文字をミュート" block: "ブロック" unblock: "ブロック解除" suspend: "凍結" diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue index 90b37e390..65f227e9a 100644 --- a/packages/frontend/src/components/MkEmojiPickerDialog.vue +++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue @@ -29,15 +29,29 @@ SPDX-License-Identifier: AGPL-3.0-only :max-height="maxHeight" @chosen="chosen" /> +
+ {{ i18n.ts.remoteCustomEmojiMuted }} + + + {{ i18n.ts.add }} + +
+ +
+
@@ -104,6 +112,7 @@ watch([() => props.note.reactions, () => props.maxNumber], ([newSource, maxNumbe flex-wrap: wrap; align-items: center; margin: 4px -2px 0 -2px; + max-width: 100%; &:empty { display: none; diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue index de4db848d..2445a14d5 100644 --- a/packages/frontend/src/pages/settings/mute-block.vue +++ b/packages/frontend/src/pages/settings/mute-block.vue @@ -12,6 +12,23 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + +
+
+ + +
+
+
+ @@ -119,7 +136,7 @@ SPDX-License-Identifier: AGPL-3.0-only