From a5e7ada62fa2824be158f0b3bed7f3c39ce9c0fa Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Tue, 26 Feb 2019 23:23:24 +0900
Subject: [PATCH] Improve account media query (#10121)
---
app/controllers/api/v1/accounts/statuses_controller.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 6fdc827cb2..ed10f3f6a7 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -51,9 +51,9 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
# Also, Avoid getting slow by not narrowing down by `statuses.account_id`.
# When narrowing down by `statuses.account_id`, `index_statuses_20180106` will be used
# and the table will be joined by `Merge Semi Join`, so the query will be slow.
- Status.joins(:media_attachments).merge(@account.media_attachments).permitted_for(@account, current_account)
- .paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
- .reorder(id: :desc).distinct(:id).pluck(:id)
+ @account.statuses.joins(:media_attachments).merge(@account.media_attachments).permitted_for(@account, current_account)
+ .paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
+ .reorder(id: :desc).distinct(:id).pluck(:id)
end
def pinned_scope