1 files changed, 16 insertions, 3 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index a88cf64d842..29cb60ad3cc 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -33,6 +33,21 @@ class DashboardController < Dashboard::ApplicationController
   protected
 
   def load_events
+    @events =
+      if params[:filter] == "followed"
+        load_user_events
+      else
+        load_project_events
+      end
+
+    Events::RenderService.new(current_user).execute(@events)
+  end
+
+  def load_user_events
+    UserRecentEventsFinder.new(current_user, current_user.followees, event_filter, params).execute
+  end
+
+  def load_project_events
     projects =
       if params[:filter] == "starred"
         ProjectsFinder.new(current_user: current_user, params: { starred: true }).execute
@@ -40,12 +55,10 @@ class DashboardController < Dashboard::ApplicationController
         current_user.authorized_projects
       end
 
-    @events = EventCollection
+    EventCollection
       .new(projects, offset: params[:offset].to_i, filter: event_filter)
       .to_a
       .map(&:present)
-
-    Events::RenderService.new(current_user).execute(@events)
   end
 
   def set_show_full_reference