about summary refs log tree commit diff
path: root/app/assets/javascripts/components
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-10-15 13:48:38 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-15 13:48:38 +0200
commit67b35a601ad88cd052ceae8d99c1e6df199cf50b (patch)
treea685cf347f721fc1bf2258b50726b7ad9c837f1f /app/assets/javascripts/components
parentaa9d48343d85449e96c6002131b45be4becd2c0d (diff)
Exclude blocked users from follow suggestions, fix tests
Diffstat (limited to 'app/assets/javascripts/components')
-rw-r--r--app/assets/javascripts/components/reducers/timelines.jsx4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index 9fb84b585..d4c6d43b4 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -164,6 +164,10 @@ function normalizeAccount(state, account, relationship) {
 };
 
 function normalizeRelationship(state, relationship) {
+  if (state.get('suggestions').includes(relationship.get('id')) && (relationship.get('following') || relationship.get('blocking'))) {
+    state = state.update('suggestions', list => list.filterNot(id => id === relationship.get('id')));
+  }
+
   return state.setIn(['relationships', relationship.get('id')], relationship);
 };