feat: 通知で返信があるノートの親ノートを表示しないようにする設定を追加

kokonect-link · Sep 22, 2023 · 887a6d5 · 887a6d5
1 parent 3339391
commit 887a6d5
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 18 deletions.
diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
@@ -51,6 +51,7 @@
   - 이미지를 업로드할 때 손실 압축으로 변경할 수 있음
 - Feat: Scratchpad에서 Async: 계열 함수나 버튼 콜백 등의 오류에도 대화창을 띄우도록(시험적이라 Play 등에는 미구현) (misskey-dev/misskey#11850)
 - Feat: 민감한 미디어를 돋보이게 하는 설정 추가 (misskey-dev/misskey#11851)
+- Feat: 알림에서 답글이 달린 노트의 상위 노트를 표시하지 않도록 하는 설정 추가
 - Spec: 사용자 정의 이모티콘 라이센스를 여러 항목으로 추가할 수 있도록 (MisskeyIO/misskey#130)
 - Enhance: 새로운 신고가 있는 경우, 네비게이션 바의 제어판 아이콘과 제어판 페이지의 신고 섹션에 점을 표시
 - Enhance: 스크롤 시 요소 표시 기능을 Friendly 이외의 UI에도 대응

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -1222,6 +1222,7 @@ _cherrypick:
   mobileTimelineHeaderChange: "Timeline header design change in mobile environment"
   renameTheButtonInPostFormToNya: "Change the \"Note\" button on the note-posting form to \"Nyan!\""
   renameTheButtonInPostFormToNyaDescription: "Outside of the note-posting form, they are still as \"Note\"."
+  showReplyInNotification: "Show parent note of notes with replies in notifications"
 _displayHeaderNavBarWhenScroll:
   all: "Display all"
   hideHeaderOnly: "Hide header only"

diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -1233,6 +1233,7 @@ export interface Locale {
         "mobileTimelineHeaderChange": string;
         "renameTheButtonInPostFormToNya": string;
         "renameTheButtonInPostFormToNyaDescription": string;
+        "showReplyInNotification": string;
     };
     "_displayHeaderNavBarWhenScroll": {
         "all": string;

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1231,6 +1231,7 @@ _cherrypick:
   mobileTimelineHeaderChange: "モバイル環境でタイムラインのヘッダーデザインを変更"
   renameTheButtonInPostFormToNya: "ノート作成画面の「ノート」ボタンを「にゃ！」に変更する"
   renameTheButtonInPostFormToNyaDescription: "にゃあにゃんにゃんにゃんにゃにゃん？"
+  showReplyInNotification: "通知で返信があるノートの親ノートを表示する"
 
 _displayHeaderNavBarWhenScroll:
   all: "全て表示"

diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
@@ -1218,6 +1218,7 @@ _cherrypick:
   mobileTimelineHeaderChange: "모바일 환경에서 타임라인의 헤더 디자인을 변경"
   renameTheButtonInPostFormToNya: "노트 작성 화면의 \"노트\" 버튼을 \"냥!\"으로 변경"
   renameTheButtonInPostFormToNyaDescription: "냐앙냥냥냥냐냥?"
+  showReplyInNotification: "알림에서 답글이 달린 노트의 상위 노트 표시하기"
 _displayHeaderNavBarWhenScroll:
   all: "모두 표시"
   hideHeaderOnly: "헤더만 숨기기"

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
@@ -51,7 +51,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</span>
 		</div>
 	</div>
-	<MkNoteSub v-if="appearNote.reply && !renoteCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
+  <MkNoteSub v-if="appearNote.reply && !renoteCollapsed && notification && defaultStore.state.showReplyInNotification" :note="appearNote.reply" :class="$style.replyTo"/>
+	<MkNoteSub v-else-if="appearNote.reply && !renoteCollapsed && !notification" :note="appearNote.reply" :class="$style.replyTo"/>
 	<div v-if="renoteCollapsed" :class="$style.collapsedRenoteTarget">
 		<MkAvatar v-if="!defaultStore.state.hideAvatarsInNote" :class="$style.collapsedRenoteTargetAvatar" :user="appearNote.user" link preview/>
 		<Mfm :text="getNoteSummary(appearNote)" :plain="true" :nowrap="true" :author="appearNote.user" :class="$style.collapsedRenoteTargetText" @click="renoteCollapsed = false"/>
@@ -210,10 +211,13 @@ import { instance } from '@/instance.js';
 
 let showEl = $ref(false);
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
 	pinned?: boolean;
-}>();
+  notification?: boolean;
+}>(), {
+  notification: false,
+});
 
 const inChannel = inject('inChannel', null);
 const currentClip = inject<Ref<Misskey.entities.Clip> | null>('currentClip', null);

diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<template #default="{ items: notifications }">
 		<MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :noGap="!defaultStore.state.showGapBetweenNotesInTimeline || mainRouter.currentRoute.value.name !== 'my-notifications'">
-			<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/>
+			<MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note" :notification="true"/>
 			<XNotification v-else :key="notification.id" :notification="notification" :withTime="true" :full="true" class="_panel notification"/>
 		</MkDateSeparatedList>
 	</template>

diff --git a/packages/frontend/src/pages/settings/cherrypick.vue b/packages/frontend/src/pages/settings/cherrypick.vue
@@ -58,6 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				{{ i18n.ts._cherrypick.renameTheButtonInPostFormToNya }}
 				<template #caption>{{ i18n.ts._cherrypick.renameTheButtonInPostFormToNyaDescription }}</template>
 			</MkSwitch>
+			<MkSwitch v-model="showReplyInNotification">{{ i18n.ts._cherrypick.showReplyInNotification }}</MkSwitch>
 		</div>
 	</FormSection>
 </div>
@@ -94,11 +95,13 @@ const showFollowingMessageInsteadOfButtonEnabled = computed(defaultStore.makeGet
 const mobileTimelineHeaderChange = computed(defaultStore.makeGetterSetter('mobileTimelineHeaderChange'));
 const displayHeaderNavBarWhenScroll = computed(defaultStore.makeGetterSetter('displayHeaderNavBarWhenScroll'));
 const renameTheButtonInPostFormToNya = computed(defaultStore.makeGetterSetter('renameTheButtonInPostFormToNya'));
+const showReplyInNotification = computed(defaultStore.makeGetterSetter('showReplyInNotification'));
 
 watch([
 	infoButtonForNoteActionsEnabled,
 	reactableRemoteReactionEnabled,
 	renameTheButtonInPostFormToNya,
+	showReplyInNotification,
 ], async () => {
 	await reloadAsk();
 });

diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -104,22 +104,23 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'showSubNoteFooterButton',
 	'enableHomeTimeline',
 	'enableLocalTimeline',
-  'enableMediaTimeline',
-  'enableSocialTimeline',
-  'enableCatTimeline',
-  'enableGlobalTimeline',
-  'enableListTimeline',
-  'enableAntennaTimeline',
-  'enableChannelTimeline',
+	'enableMediaTimeline',
+	'enableSocialTimeline',
+	'enableCatTimeline',
+	'enableGlobalTimeline',
+	'enableListTimeline',
+	'enableAntennaTimeline',
+	'enableChannelTimeline',
 	'useEnterToSend',
 	'postFormVisibilityHotkey',
-  'showRenoteConfirmPopup',
-  'displayHeaderNavBarWhenScroll',
-  'infoButtonForNoteActionsEnabled',
-  'reactableRemoteReactionEnabled',
-  'showFollowingMessageInsteadOfButtonEnabled',
-  'mobileTimelineHeaderChange',
-  'renameTheButtonInPostFormToNya',
+	'showRenoteConfirmPopup',
+	'displayHeaderNavBarWhenScroll',
+	'infoButtonForNoteActionsEnabled',
+	'reactableRemoteReactionEnabled',
+	'showFollowingMessageInsteadOfButtonEnabled',
+	'mobileTimelineHeaderChange',
+	'renameTheButtonInPostFormToNya',
+	'showReplyInNotification',
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
 	'lightTheme',

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
@@ -517,6 +517,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: false,
 	},
+	showReplyInNotification: {
+		where: 'device',
+		default: false,
+	},
 
 	// - etc
 	friendlyEnableNotifications: {