From cdcdc457dfc059ba6186fff3dc4b329287eeed89 Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Fri, 14 Jul 2023 00:14:57 -0400
Subject: [PATCH] fix: Follow Request labeling

resolves #10368
---
 locales/en-US.yml                                 | 2 +-
 packages/backend/src/models/repositories/user.ts  | 2 +-
 packages/client/src/components/MkFollowButton.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 415d87230..1cead0fbf 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -105,7 +105,7 @@ privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
 defaultNoteVisibility: "Default visibility"
 follow: "Follow"
-followRequest: "Follow"
+followRequest: "Follow Request"
 followRequests: "Follow requests"
 unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 5ca36e3d3..e4aab896d 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -453,6 +453,7 @@ export const UserRepository = db.getRepository(User).extend({
 			isAdmin: user.isAdmin || falsy,
 			isModerator: user.isModerator || falsy,
 			isBot: user.isBot || falsy,
+			isLocked: user.isLocked,
 			isCat: user.isCat || falsy,
 			speakAsCat: user.speakAsCat || falsy,
 			instance: user.host
@@ -497,7 +498,6 @@ export const UserRepository = db.getRepository(User).extend({
 							: null,
 						bannerBlurhash: user.banner?.blurhash || null,
 						bannerColor: null, // 後方互換性のため
-						isLocked: user.isLocked,
 						isSilenced: user.isSilenced || falsy,
 						isSuspended: user.isSuspended || falsy,
 						description: profile!.description,
diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index e8dd63a35..bb0ce0b69 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -46,7 +46,7 @@
 			</template>
 			<template v-else-if="!isFollowing && user.isLocked">
 				<span>{{ (state = i18n.ts.followRequest) }}</span
-				><i class="ph-plus ph-bold ph-lg"></i>
+				><i class="ph-lock-open ph-bold ph-lg"></i>
 			</template>
 			<template v-else-if="!isFollowing && !user.isLocked">
 				<span>{{ (state = i18n.ts.follow) }}</span