From: ThibG <thib@sitedethib.com>
Date: Mon, 28 Sep 2020 19:44:29 +0000 (+0200)
Subject: Fix bell button causing a brief “Cancel follow request” on locked accounts (#14896)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=82951920f7321fefbdf0628cbb70f2f490f7b716;p=mastodon.git

Fix bell button causing a brief “Cancel follow request” on locked accounts (#14896)
---

diff --git a/app/javascript/mastodon/reducers/relationships.js b/app/javascript/mastodon/reducers/relationships.js
index 1d050cc63..53949258a 100644
--- a/app/javascript/mastodon/reducers/relationships.js
+++ b/app/javascript/mastodon/reducers/relationships.js
@@ -45,7 +45,7 @@ const initialState = ImmutableMap();
 export default function relationships(state = initialState, action) {
   switch(action.type) {
   case ACCOUNT_FOLLOW_REQUEST:
-    return state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
+    return state.getIn([action.id, 'following']) ? state : state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
   case ACCOUNT_FOLLOW_FAIL:
     return state.setIn([action.id, action.locked ? 'requested' : 'following'], false);
   case ACCOUNT_UNFOLLOW_REQUEST: