Merge remote-tracking branch 'upstream/develop' into docs

* upstream/develop: (193 commits)
  fix user avatar fallback logic
  remove dead code
  make bio textarea resizable vertically only
  remove dead code
  remove dead code
  fix crazy watch logic in conversation
  show three dot button only if needed
  hide mute conversation button to guests
  update keyBy
  generate idObj at timeline level
  fix pin showing logic in conversation
  Show a message when JS is disabled
  Initialize chat only if user is logged in and it wasn't initialized before
  i18n/Update Japanese
  i18n/Update pedantic Japanese
  sync profile tab state with location query
  refactor TabSwitcher
  use better name of controlled prop
  fix potential bug to render active tab in controlled way
  remove unused param
  ...

1 files changed, 10 insertions, 20 deletions

diff --git a/src/services/follow_manipulate/follow_manipulate.js b/src/services/follow_manipulate/follow_manipulate.js
index b2486e7c..529fdb9b 100644
--- a/src/services/follow_manipulate/follow_manipulate.js
+++ b/src/services/follow_manipulate/follow_manipulate.js
@@ -2,17 +2,17 @@ const fetchUser = (attempt, user, store) => new Promise((resolve, reject) => {
   setTimeout(() => {
     store.state.api.backendInteractor.fetchUser({ id: user.id })
       .then((user) => store.commit('addNewUsers', [user]))
-      .then(() => resolve([user.following, attempt]))
+      .then(() => resolve([user.following, user.requested, user.locked, attempt]))
       .catch((e) => reject(e))
   }, 500)
-}).then(([following, attempt]) => {
-  if (!following && attempt <= 3) {
+}).then(([following, sent, locked, attempt]) => {
+  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 following
+    return sent
   }
 })
 
@@ -21,14 +21,10 @@ export const requestFollow = (user, store) => new Promise((resolve, reject) => {
     .then((updated) => {
       store.commit('updateUserRelationship', [updated])
 
-      // For locked users we just mark it that we sent the follow request
-      if (updated.locked) {
-        resolve({ sent: true })
-      }
-
-      if (updated.following) {
-        // If we get result immediately, just stop.
-        resolve({ sent: false })
+      if (updated.following || (user.locked && user.requested)) {
+        // If we get result immediately or the account is locked, just stop.
+        resolve({ sent: updated.requested })
+        return
       }
 
       // But usually we don't get result immediately, so we ask server
@@ -39,14 +35,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((following) => {
-          if (following) {
-            // We confirmed and everything's good.
-            resolve({ sent: false })
-          } else {
-            // If after all the tries, just treat it as if user is locked
-            resolve({ sent: false })
-          }
+        .then((sent) => {
+          resolve({ sent })
         })
     })
 })