From d52755a1537ed3b162600f95ed6f3aefcee12f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Mon, 3 Jul 2023 02:09:30 +0800
Subject: [PATCH] feat: withdraw follow request

closes #2179
closes #2162
---
 components/account/AccountFollowButton.vue |  6 +++---
 composables/masto/relationship.ts          | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue
index ba1548cb..ecada64e 100644
--- a/components/account/AccountFollowButton.vue
+++ b/components/account/AccountFollowButton.vue
@@ -71,7 +71,6 @@ const buttonStyle = $computed(() => {
   <button
     v-if="enable"
     gap-1 items-center group
-    :disabled="relationship?.requested"
     border-1
     rounded-full flex="~ gap2 center" font-500 min-w-30 h-fit px3 py1
     :class="buttonStyle"
@@ -91,11 +90,12 @@ const buttonStyle = $computed(() => {
       <span hidden elk-group-hover="inline">{{ $t('account.unfollow') }}</span>
     </template>
     <template v-else-if="relationship?.requested">
-      <span>{{ $t('account.follow_requested') }}</span>
+      <span elk-group-hover="hidden">{{ $t('account.follow_requested') }}</span>
+      <span hidden elk-group-hover="inline">Withdraw follow request</span>
     </template>
     <template v-else-if="relationship ? relationship.followedBy : context === 'followedBy'">
       <span elk-group-hover="hidden">{{ $t('account.follows_you') }}</span>
-      <span hidden elk-group-hover="inline">{{ $t('account.follow_back') }}</span>
+      <span hidden elk-group-hover="inline">{{ account.locked ? $t('account.request_follow') : $t('account.follow_back') }}</span>
     </template>
     <template v-else>
       <span>{{ account.locked ? $t('account.request_follow') : $t('account.follow') }}</span>
diff --git a/composables/masto/relationship.ts b/composables/masto/relationship.ts
index 42c1fa5b..00f3cf72 100644
--- a/composables/masto/relationship.ts
+++ b/composables/masto/relationship.ts
@@ -36,7 +36,9 @@ export async function toggleFollowAccount(relationship: mastodon.v1.Relationship
   const { client } = $(useMasto())
   const i18n = useNuxtApp().$i18n
 
-  if (relationship!.following) {
+  const unfollow = relationship!.following || relationship!.requested
+
+  if (unfollow) {
     if (await openConfirmDialog({
       title: i18n.t('confirm.unfollow.title'),
       confirm: i18n.t('confirm.unfollow.confirm'),
@@ -44,8 +46,19 @@ export async function toggleFollowAccount(relationship: mastodon.v1.Relationship
     }) !== 'confirm')
       return
   }
-  relationship!.following = !relationship!.following
-  relationship = await client.v1.accounts[relationship!.following ? 'follow' : 'unfollow'](account.id)
+
+  if (unfollow) {
+    relationship!.following = false
+    relationship!.requested = false
+  }
+  else if (account.locked) {
+    relationship!.requested = true
+  }
+  else {
+    relationship!.following = true
+  }
+
+  relationship = await client.v1.accounts[unfollow ? 'unfollow' : 'follow'](account.id)
 }
 
 export async function toggleMuteAccount(relationship: mastodon.v1.Relationship, account: mastodon.v1.Account) {