]> cat aescling's git repositories - mastodon.git/commitdiff
Remove redundant call of recent scope in AccountsController (#3330)
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Fri, 26 May 2017 14:35:25 +0000 (23:35 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 26 May 2017 14:35:25 +0000 (16:35 +0200)
recent is included in paginate_by_max_id.

app/controllers/accounts_controller.rb

index 3e580448ec82b0bdcf6470ed4fc2c3ab01d89476..11402ab79e4187ff921bb1d3b38a3e1c3b220923 100644 (file)
@@ -6,12 +6,12 @@ class AccountsController < ApplicationController
   def show
     respond_to do |format|
       format.html do
-        @statuses = @account.statuses.permitted_for(@account, current_account).recent.paginate_by_max_id(20, params[:max_id], params[:since_id])
+        @statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id])
         @statuses = cache_collection(@statuses, Status)
       end
 
       format.atom do
-        @entries = @account.stream_entries.recent.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
+        @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
         render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a))
       end