From 47b2f619a6080850cb41177f7e0aec39bfcb0906 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 30 Oct 2022 17:27:05 +0100
Subject: [PATCH] client: fix follow button getting stuck processing

If a user on a remote instances changes their profile to manually accept
follow requests, this change may not immediately be federated. Because of
this, a user may get stuck seeing "processing".
---
 .../client/src/components/follow-button.vue   | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/follow-button.vue b/packages/client/src/components/follow-button.vue
index 7c4f5abd3..938e73e27 100644
--- a/packages/client/src/components/follow-button.vue
+++ b/packages/client/src/components/follow-button.vue
@@ -5,26 +5,17 @@
 	:disabled="wait"
 	@click="onClick"
 >
-	<template v-if="!wait">
-		<template v-if="hasPendingFollowRequestFromYou && user.isLocked">
-			<span v-if="full">{{ i18n.ts.followRequestPending }}</span><i class="fas fa-hourglass-half"></i>
-		</template>
-		<template v-else-if="hasPendingFollowRequestFromYou && !user.isLocked">
-			<!-- つまりリモートフォローの場合。 -->
-			<span v-if="full">{{ i18n.ts.processing }}</span><i class="fas fa-spinner fa-pulse"></i>
-		</template>
-		<template v-else-if="isFollowing">
-			<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="fas fa-minus"></i>
-		</template>
-		<template v-else-if="!isFollowing && user.isLocked">
-			<span v-if="full">{{ i18n.ts.followRequest }}</span><i class="fas fa-plus"></i>
-		</template>
-		<template v-else-if="!isFollowing && !user.isLocked">
-			<span v-if="full">{{ i18n.ts.follow }}</span><i class="fas fa-plus"></i>
-		</template>
+	<template v-if="wait">
+		<span v-if="full">{{ i18n.ts.processing }}</span><i class="fas fa-spinner fa-pulse fa-fw"></i>
+	</template>
+	<template v-else-if="hasPendingFollowRequestFromYou">
+		<span v-if="full">{{ i18n.ts.followRequestPending }}</span><i class="fas fa-hourglass-half"></i>
+	</template>
+	<template v-else-if="isFollowing">
+		<span v-if="full">{{ i18n.ts.unfollow }}</span><i class="fas fa-minus"></i>
 	</template>
 	<template v-else>
-		<span v-if="full">{{ i18n.ts.processing }}</span><i class="fas fa-spinner fa-pulse fa-fw"></i>
+		<span v-if="full">{{ user.isLocked ? i18n.ts.followRequest : i18n.ts.follow }}</span><i class="fas fa-plus"></i>
 	</template>
 </button>
 </template>