From c7a1189ee040fdda840f83620c4f3394974e8a5a Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Thu, 20 Apr 2023 10:06:16 +0200
Subject: [PATCH] Restore follow button in user lists

Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 src/components/FollowButton.vue | 4 ----
 src/components/ProfileInfo.vue  | 2 +-
 src/components/UserEntry.vue    | 9 ++++++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/FollowButton.vue b/src/components/FollowButton.vue
index 3390c1fc..01b17c0e 100644
--- a/src/components/FollowButton.vue
+++ b/src/components/FollowButton.vue
@@ -72,10 +72,6 @@ export default {
 		currentUser,
 	],
 	props: {
-		account: {
-			type: String,
-			default: '',
-		},
 		uid: {
 			type: String,
 			default: '',
diff --git a/src/components/ProfileInfo.vue b/src/components/ProfileInfo.vue
index ed2e384b..c40d1452 100644
--- a/src/components/ProfileInfo.vue
+++ b/src/components/ProfileInfo.vue
@@ -59,7 +59,7 @@
 		<!-- Hack to render note safely -->
 		<MessageContent v-if="accountInfo.note" class="user-profile__note user-profile__info" :item="{content: accountInfo.note, tag: [], mentions: []}" />
 
-		<FollowButton class="user-profile__info" :account="accountInfo.acct" :uid="uid" />
+		<FollowButton class="user-profile__info" :uid="uid" />
 		<NcButton v-if="serverData.public"
 			class="user-profile__info primary"
 			@click="followRemote">
diff --git a/src/components/UserEntry.vue b/src/components/UserEntry.vue
index 370753ca..7ec97b31 100644
--- a/src/components/UserEntry.vue
+++ b/src/components/UserEntry.vue
@@ -53,7 +53,7 @@
 				<!-- eslint-disable-next-line vue/no-v-html -->
 				<p v-html="item.note" />
 			</div>
-			<FollowButton :account="item.acct" :uid="cloudId" />
+			<FollowButton :uid="item.acct" />
 		</div>
 	</div>
 </template>
@@ -61,6 +61,7 @@
 <script>
 import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
 import currentUser from '../mixins/currentUserMixin.js'
+import accountMixins from '../mixins/accountMixins.js'
 import FollowButton from './FollowButton.vue'
 
 export default {
@@ -70,6 +71,7 @@ export default {
 		NcAvatar,
 	},
 	mixins: [
+		accountMixins,
 		currentUser,
 	],
 	props: {
@@ -92,6 +94,11 @@ export default {
 			return !this.item.acct.includes('@')
 		},
 	},
+	async mounted() {
+		if (this.relationship === undefined) {
+			await this.$store.dispatch('fetchAccountRelationshipInfo', [this.item.id])
+		}
+	},
 }
 </script>
 <style scoped lang="scss">