「既にフォローしている場合、通知欄にフォローボタンを表示しない」をオプショナルに

shrimpia · Apr 14, 2023 · 9345149 · 9345149
1 parent 2784121
commit 9345149
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
@@ -1,9 +1,6 @@
 <template>
-<span v-if="disableIfFollowing && isFollowing" style="opacity: 0.5">
-	{{ $ts.alreadyFollowed }}
-</span>
 <button
-	v-else
+	v-if="!disableIfFollowing || !isFollowing"
 	class="kpoogebi _button"
 	:class="{ wait, active: isFollowing || hasPendingFollowRequestFromYou, full, large }"
 	:disabled="wait"

diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
@@ -64,7 +64,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" disable-if-following/></div>
+				<div v-if="full"><MkFollowButton :user="notification.user" :full="true" :disable-if-following="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'">
@@ -96,6 +96,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/ebisskey.vue b/packages/frontend/src/pages/settings/ebisskey.vue
@@ -44,6 +44,9 @@
 			<MkSwitch v-model="reactableRemoteReactionEnabled">
 				リモートのカスタム絵文字リアクションでも、このサーバーに同じ名前の絵文字があればリアクションできるようにする
 			</MkSwitch>
+			<MkSwitch v-model="showFollowingMessageInsteadOfButtonEnabled">
+				既にフォローしている場合、通知欄にフォローボタンを表示しない
+			</MkSwitch>
 		</div>
 	</FormSection>
 	<FormSection>
@@ -75,6 +78,8 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import MkNote from "@/components/MkNote.vue";
 import {Note, User} from "misskey-js/built/entities";
 import {$i} from "@/account";
+import MkButton from "@/components/MkButton.vue";
+import {confetti} from "@/scripts/confetti";
 
 async function reloadAsk() {
 	const { canceled } = await os.confirm({
@@ -94,6 +99,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',
@@ -112,7 +118,6 @@ const noteMock: Note = {
 	repliesCount: 10,
 	emojis: [],
 	localOnly: true,
-
 };
 
 watch([

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
@@ -334,6 +334,11 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: true,
 	},
+	showFollowingMessageInsteadOfButtonEnabled: {
+		where: 'account',
+		default: true,
+	},
+
 	// -- Labs
 	usePostFormWindow: {
 		where: 'device',