about summary refs log tree commit diff
path: root/app/controllers/api
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-08 20:16:11 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-08 20:20:45 +0100
commit6c4c84b161947cb11ad0451a39e26b25be4c93d5 (patch)
treefa2a6f4aaff71fcf76c745a57cb7732102814871 /app/controllers/api
parentfe57f6330f089d023f0fa4db7f7c8a51551d2ee9 (diff)
Distrubute statuses as a fan-out-on-write system, with optional precomputing
Diffstat (limited to 'app/controllers/api')
-rw-r--r--app/controllers/api/statuses_controller.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/api/statuses_controller.rb b/app/controllers/api/statuses_controller.rb
index 82334a32f..04128537a 100644
--- a/app/controllers/api/statuses_controller.rb
+++ b/app/controllers/api/statuses_controller.rb
@@ -22,10 +22,12 @@ class Api::StatusesController < ApiController
   end
 
   def home
-    @statuses = Status.where(account: [current_user.account] + current_user.account.following).order('created_at desc')
+    feed      = Feed.new(:home, current_user.account)
+    @statuses = feed.get(20, (params[:offset] || 0).to_i)
   end
 
   def mentions
-    @statuses = Status.where(id: Mention.where(account: current_user.account).pluck(:status_id)).order('created_at desc')
+    feed      = Feed.new(:mentions, current_user.account)
+    @statuses = feed.get(20, (params[:offset] || 0).to_i)
   end
 end