diff options
| author | ThibG <thib@sitedethib.com> | 2020-10-22 22:38:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-22 22:38:11 +0200 |
| commit | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (patch) | |
| tree | 3f5e2b47d242c4044f0cd69433501834399879d5 /app/javascript/flavours/glitch/reducers/relationships.js | |
| parent | 29870d2be6c0e78132416b5561aba20d6ca3c746 (diff) | |
| parent | 5c60f7eaedbc2dc6184f8b2a4d99f58fdbd5b26b (diff) | |
Merge pull request #1441 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/relationships.js')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/relationships.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/relationships.js b/app/javascript/flavours/glitch/reducers/relationships.js index 33eb5b425..49dd77ef5 100644 --- a/app/javascript/flavours/glitch/reducers/relationships.js +++ b/app/javascript/flavours/glitch/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: |