Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Exclude blocked users from follow suggestions, fix tests

Browse source
This commit is contained in:
Eugen Rochko 2016-10-15 13:48:38 +02:00
parent aa9d48343d
commit 67b35a601a
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/components/reducers/timelines.jsx
View file

@ -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);
};

2
app/models/follow_suggestion.rb
View file

@ -2,7 +2,7 @@ class FollowSuggestion
def self.get(for_account_id, limit = 6)
neo = Neography::Rest.new
account_ids = neo.execute_query('START a=node:account_index(Account={id}) MATCH (a)-[:follows]->(b)-[:follows]->(c) WHERE a <> c AND NOT (a)-[:follows]->(c) RETURN DISTINCT c.account_id', id: for_account_id)
Account.where(id: account_ids['data'].map(&:first)).limit(limit) unless account_ids.empty?
Account.where(id: account_ids['data'].map(&:first) - Block.where(account_id: for_account_id).pluck(:target_account_id)).limit(limit) unless account_ids.empty?
rescue Neography::NeographyError, Excon::Error::Socket => e
Rails.logger.error e
[]