diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-05 11:16:11 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-05 11:17:53 +0300 |
| commit | 424d4ab57e13a8a271a16e063ce70af98759f8f9 (patch) | |
| tree | 80a46aa573375f769c63db047966a3faaaed1b78 /src/services/follow_manipulate | |
| parent | c89703a35980f900b4d206538dc07f83e87c84d8 (diff) | |
Utilize `user.requested` to display follow request status on user card
Closes #635
Diffstat (limited to 'src/services/follow_manipulate')
| -rw-r--r-- | src/services/follow_manipulate/follow_manipulate.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/services/follow_manipulate/follow_manipulate.js b/src/services/follow_manipulate/follow_manipulate.js index 529fdb9b..d82ce593 100644 --- a/src/services/follow_manipulate/follow_manipulate.js +++ b/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() }) }) }) |
