From 19b4185b8ace168ac01b994136b52ab00d5ce340 Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Wed, 11 Oct 2023 18:15:31 +0900
Subject: [PATCH 1/4] =?UTF-8?q?enhance:=20=E4=BB=A5=E5=89=8D=E3=81=AB?=
=?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=82=BD?=
=?UTF-8?q?=E3=83=95=E3=83=88=E3=83=AF=E3=83=BC=E3=83=89=E3=83=9F=E3=83=A5?=
=?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D?=
=?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locales/index.d.ts | 3 ++
locales/ja-JP.yml | 3 ++
.../pages/settings/mute-block.word-mute.vue | 39 +++++++++++++++----
packages/frontend/src/store.ts | 8 ++++
4 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 270b0f0ae27f..33af9f43d10b 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1184,6 +1184,9 @@ export interface Locale {
"privacyPolicy": string;
"privacyPolicyUrl": string;
"tosAndPrivacyPolicy": string;
+ "showOldMuteWords": string;
+ "showMutedInfo": string;
+ "showMutedInfoDescription": string;
"_announcement": {
"forExistingUsers": string;
"forExistingUsersDescription": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 1fdc432c879d..7b622b731cb3 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1181,6 +1181,9 @@ impressumDescription: "ドイツなどの一部の国と地域では表示が義
privacyPolicy: "プライバシーポリシー"
privacyPolicyUrl: "プライバシーポリシーURL"
tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
+showOldMuteWords: "ソフトワードミュートに設定していた情報を表示する"
+showMutedInfo: "「○○が何か言いました」を表示する"
+showMutedInfoDescription: "オンにすると以前のソフトミュートと同様の挙動になります。オフで以前のハードミュートの挙動になります。"
_announcement:
forExistingUsers: "既存ユーザーのみ"
diff --git a/packages/frontend/src/pages/settings/mute-block.word-mute.vue b/packages/frontend/src/pages/settings/mute-block.word-mute.vue
index 25a836ea55e4..82d55892fd6a 100644
--- a/packages/frontend/src/pages/settings/mute-block.word-mute.vue
+++ b/packages/frontend/src/pages/settings/mute-block.word-mute.vue
@@ -5,6 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
{{ i18n.ts.showOldMuteWords }}
{{ i18n.ts._wordMute.muteWords }}
@@ -12,24 +13,25 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.save }}
+
+ {{ i18n.ts.showMutedInfo }}
+ {{ i18n.ts.showMutedInfoDescription }}
+
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 795d0bdd286e..7e07e502eb24 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -172,10 +172,18 @@ export const defaultStore = markRaw(new Storage('base', {
userList: null as Misskey.entities.UserList | null,
},
},
+ mutedWords: {
+ where: 'account',
+ default: [],
+ },
mutedInstancesGtl: {
where: 'account',
default: [] as string[],
},
+ showMutedInfo: {
+ where: 'account',
+ default: true,
+ },
pinnedUserLists: {
where: 'deviceAccount',
default: [] as Misskey.entities.UserList[],
From c61e3ba2585eddb6f85b8b84179ed2be1b0ea870 Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Wed, 11 Oct 2023 18:16:03 +0900
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E3=80=8C=E2=97=8B=E2=97=8B?=
=?UTF-8?q?=E3=81=8C=E4=BD=95=E3=81=8B=E8=A8=80=E3=81=84=E3=81=BE=E3=81=97?=
=?UTF-8?q?=E3=81=9F=E3=80=8D=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA?=
=?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=A7=E3=81=8D=E3=82=8B?=
=?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/components/MkNote.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index c3d60f361ce5..3b7e22c5482c 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -125,7 +125,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
@@ -221,6 +221,7 @@ const translation = ref(null);
const translating = ref(false);
const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance);
const tickerStyle = defaultStore.state.instanceTickerStyle;
+const showMutedInfo = defaultStore.state.showMutedInfo;
const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || (appearNote.visibility === 'followers' && appearNote.userId === $i.id));
let renoteCollapsed = $ref(isRenote && checkCollapseRenote(appearNote, note, $i));
From bece2c02b8553d3ce93311b10614644afc3e3fa0 Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Wed, 11 Oct 2023 18:18:02 +0900
Subject: [PATCH 3/4] =?UTF-8?q?update:=20=E3=83=89=E3=82=AD=E3=83=A5?=
=?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG_KAKUREGA.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CHANGELOG_KAKUREGA.md b/CHANGELOG_KAKUREGA.md
index 4a67bf465806..a5575cc5f913 100644
--- a/CHANGELOG_KAKUREGA.md
+++ b/CHANGELOG_KAKUREGA.md
@@ -1,3 +1,11 @@
+## 1.20.0
+Release: 2023/10/11
+Base: 2023.10.0
+
+### 新機能
+- 以前に設定していたソフトワードミュートを表示できるように
+- 「○○が何か言いました」を表示しないようにできる機能を追加
+
## 1.19.3
Release: 2023/09/26
Base: 2023.9.1
From db74924905ac9e18501d199a649aff60d5d82b5c Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Wed, 11 Oct 2023 18:18:40 +0900
Subject: [PATCH 4/4] release: v1.20.0
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index f89c66a377a0..33d6605b1938 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2023.10.0-kakurega.1.19.3",
+ "version": "2023.10.0-kakurega.1.20.0",
"codename": "nasubi",
"repository": {
"type": "git",