Merge branch 'fix/follow-request-detection' into 'develop'

Utilize `user.requested` to display follow request status on user card

Closes #635

See merge request pleroma/pleroma-fe!942

src/components/user_card/user_card.js

@@ -11,7 +11,6 @@ export default {
   data () {
     return {
       followRequestInProgress: false,
-      followRequestSent: false,
       hideUserStatsLocal: typeof this.$store.state.config.hideUserStats === 'undefined'
         ? this.$store.state.instance.hideUserStats
         : this.$store.state.config.hideUserStats,
@@ -112,9 +111,8 @@ export default {
     followUser () {
       const store = this.$store
       this.followRequestInProgress = true
-      requestFollow(this.user, store).then(({ sent }) => {
+      requestFollow(this.user, store).then(() => {
         this.followRequestInProgress = false
-        this.followRequestSent = sent
       })
     },
     unfollowUser () {

src/components/user_card/user_card.vue

@@ -135,13 +135,13 @@
             <button
               class="btn btn-default btn-block"
               :disabled="followRequestInProgress"
-              :title="followRequestSent ? $t('user_card.follow_again') : ''"
+              :title="user.requested ? $t('user_card.follow_again') : ''"
               @click="followUser"
             >
               <template v-if="followRequestInProgress">
                 {{ $t('user_card.follow_progress') }}
               </template>
-              <template v-else-if="followRequestSent">
+              <template v-else-if="user.requested">
                 {{ $t('user_card.follow_sent') }}
               </template>
               <template v-else>

src/services/follow_manipulate/follow_manipulate.js

@@ -9,10 +9,7 @@ const fetchUser = (attempt, user, store) => new Promise((resolve, reject) => {
   if (!following && !(locked && sent) && attempt <= 3) {
     // If we BE reports that we still not following that user - retry,
     // increment attempts by one
-    return fetchUser(++attempt, user, store)
-  } else {
-    // If we run out of attempts, just return whatever status is.
-    return sent
+    fetchUser(++attempt, user, store)
   }
 })
 
@@ -23,7 +20,7 @@ export const requestFollow = (user, store) => new Promise((resolve, reject) => {
 
       if (updated.following || (user.locked && user.requested)) {
         // If we get result immediately or the account is locked, just stop.
-        resolve({ sent: updated.requested })
+        resolve()
         return
       }
 
@@ -35,8 +32,8 @@ export const requestFollow = (user, store) => new Promise((resolve, reject) => {
       // Recursive Promise, it will call itself up to 3 times.
 
       return fetchUser(1, user, store)
-        .then((sent) => {
-          resolve({ sent })
+        .then(() => {
+          resolve()
         })
     })
 })