From 663c69cd835469c97147a95cdac90898ff524c5a Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 9 Jan 2017 19:49:52 -0600 Subject: [PATCH] more experimentation for global feed --- app/activity.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/activity.rb b/app/activity.rb index 38135089..3961db08 100644 --- a/app/activity.rb +++ b/app/activity.rb @@ -15,10 +15,16 @@ get '/activity' do site = Site.select(:id).where(id: event.site_id).first actioning_site = Site.select(:id).where(id: event.actioning_site_id).first - events.push(event) if !site.is_a_jerk? && !actioning_site.is_a_jerk? && actioning_site.follows_dataset.count > 2 + events.push(event) if !site.is_a_jerk? && !actioning_site.is_a_jerk? && actioning_site.follows_dataset.count > 1 end - site_change_events = Event.global_site_changes_dataset.limit(100).all + initial_site_change_events = Event.global_site_changes_dataset.limit(100).all + site_change_events = [] + + initial_site_change_events.each do |event| + site = Site.select(:id).where(id: event.site_id).first + site_change_events.push(event) if !site.is_a_jerk? && site.follows_dataset.count > 1 + end @events = []