From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Fri, 26 May 2017 14:35:25 +0000 (+0900)
Subject: Remove redundant call of recent scope in AccountsController (#3330)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=860e257a6895030db112a3e81f6d0a3e398a7b74;p=mastodon.git

Remove redundant call of recent scope in AccountsController (#3330)

recent is included in paginate_by_max_id.
---

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 3e580448e..11402ab79 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -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