From 79fb01e6a712acc5955855555c345a46dbd707b0 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 9 Jan 2017 02:22:04 -0600 Subject: [PATCH] first attempt to improve the global activity feed --- app/activity.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/activity.rb b/app/activity.rb index f31536cb..38135089 100644 --- a/app/activity.rb +++ b/app/activity.rb @@ -8,7 +8,16 @@ get '/activity' do global_dataset.where! Sequel.qualify(:events, :id) => params[:event_id] end - events = global_dataset.all + initial_events = global_dataset.all + events = [] + + initial_events.each do |event| + 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 + end + site_change_events = Event.global_site_changes_dataset.limit(100).all @events = []