about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-10-09 15:15:21 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-09 15:15:21 +0200
commit427ba276413a268939d8e93337168cdb02b2f684 (patch)
treef13fe6a62a89882d11d884fdcdd197cf10bd4f17 /app/controllers
parent769b1ebbe0de2e3c9929add50bc18718055690d1 (diff)
Public timeline to exclude users you blocked
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/statuses_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 952ed641d..64dc3f84e 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -55,7 +55,7 @@ class Api::V1::StatusesController < ApiController
   end
 
   def public
-    @statuses = Status.with_includes.with_counters.order('id desc').paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
+    @statuses = Status.as_public_timeline(current_user.account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
     render action: :index
   end
 end