From 80976114e36cdc2a117579cf8f65e11314bf3498 Mon Sep 17 00:00:00 2001
From: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Date: Fri, 14 Apr 2023 21:24:32 +0900
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E6=97=A2=E3=81=AB=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=80=81=E9=80=9A=E7=9F=A5=E6=AC=84=E3=81=AB=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AD=E3=83=BC=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E3=80=8D=E3=82=92?=
 =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=8A=E3=83=AB=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkFollowButton.vue | 7 +++++++
 packages/frontend/src/components/MkNotification.vue | 3 ++-
 packages/frontend/src/pages/settings/cherrypick.vue | 5 ++++-
 packages/frontend/src/store.ts                      | 4 ++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index 81530c3a3a..7d567001f4 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -1,5 +1,6 @@
 <template>
 <button
+	v-if="!disableIfFollowing || !isFollowing"
 	class="_button"
 	:class="[$style.root, { [$style.wait]: wait, [$style.active]: isFollowing || hasPendingFollowRequestFromYou, [$style.full]: full, [$style.large]: large }]"
 	:disabled="wait"
@@ -43,9 +44,15 @@ const props = withDefaults(defineProps<{
 	user: Misskey.entities.UserDetailed,
 	full?: boolean,
 	large?: boolean,
+
+	// CherryPick
+	disableIfFollowing?: boolean,
 }>(), {
 	full: false,
 	large: false,
+
+	// CherryPick
+	disableIfFollowing: false,
 });
 
 let isFollowing = $ref(props.user.isFollowing);
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 380a697814..86a9f09b90 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -77,7 +77,7 @@
 			</MkA>
 			<template v-else-if="notification.type === 'follow'">
 				<span :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}</span>
-				<div v-if="full"><MkFollowButton :user="notification.user" :full="true"/></div>
+				<div v-if="full"><MkFollowButton :user="notification.user" :full="true" :disableIfFollowing="defaultStore.reactiveState.showFollowingMessageInsteadOfButtonEnabled.value"/></div>
 			</template>
 			<span v-else-if="notification.type === 'followRequestAccepted'" :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.followRequestAccepted }}</span>
 			<template v-else-if="notification.type === 'receiveFollowRequest'">
@@ -121,6 +121,7 @@ import { i18n } from '@/i18n';
 import * as os from '@/os';
 import { useTooltip } from '@/scripts/use-tooltip';
 import { $i } from '@/account';
+import { defaultStore } from '@/store';
 
 const props = withDefaults(defineProps<{
 	notification: misskey.entities.Notification;
diff --git a/packages/frontend/src/pages/settings/cherrypick.vue b/packages/frontend/src/pages/settings/cherrypick.vue
index 9b933c2525..bf9ddf8b3e 100644
--- a/packages/frontend/src/pages/settings/cherrypick.vue
+++ b/packages/frontend/src/pages/settings/cherrypick.vue
@@ -22,6 +22,9 @@
 			</MkSwitch>
 			<MkSwitch v-model="rememberPostFormToggleStateEnabled">{{ i18n.ts._cherrypick.rememberPostFormToggleState }}</MkSwitch>
 			<MkSwitch v-model="reactableRemoteReactionEnabled">{{ i18n.ts._cherrypick.reactableRemoteReaction }}</MkSwitch>
+			<MkSwitch v-model="showFollowingMessageInsteadOfButtonEnabled">
+				既にフォローしている場合、通知欄にフォローボタンを表示しない
+			</MkSwitch>
 		</div>
 	</FormSection>
 	<!--
@@ -74,6 +77,7 @@ const reactableRemoteReactionEnabled = computed(defaultStore.makeGetterSetter('r
 const rememberPostFormToggleStateEnabled = computed(defaultStore.makeGetterSetter('rememberPostFormToggleStateEnabled'));
 const usePostFormWindow = computed(defaultStore.makeGetterSetter('usePostFormWindow'));
 const ebiNoteViewEnabled = computed(defaultStore.makeGetterSetter('ebiNoteViewEnabledLab'));
+const showFollowingMessageInsteadOfButtonEnabled = computed(defaultStore.makeGetterSetter('showFollowingMessageInsteadOfButtonEnabled'));
 
 const noteMock: Note = {
 	id: 'abc',
@@ -92,7 +96,6 @@ const noteMock: Note = {
 	repliesCount: 10,
 	emojis: [],
 	localOnly: true,
-
 };
 
 watch([
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 8d839f8421..e6a3b31144 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -398,6 +398,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: true,
 	},
+	showFollowingMessageInsteadOfButtonEnabled: {
+		where: 'account',
+		default: true,
+	},
 	// #endregion
 }));