diff options
author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-05-20 22:13:51 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-20 15:13:51 +0200 |
commit | f55480756337dd4df7513e89673e81e003f1201a (patch) | |
tree | bfd4aabb606f82f2fe01a16bcceec340ec11ecd3 /app/controllers/api/v1/mutes_controller.rb | |
parent | d972845ff663605becec1dde904271897fe2e347 (diff) |
Use joins for account properties (#3167)
Diffstat (limited to 'app/controllers/api/v1/mutes_controller.rb')
-rw-r--r-- | app/controllers/api/v1/mutes_controller.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb index cbd98732b..baf1fc7ef 100644 --- a/app/controllers/api/v1/mutes_controller.rb +++ b/app/controllers/api/v1/mutes_controller.rb @@ -7,12 +7,14 @@ class Api::V1::MutesController < ApiController respond_to :json def index - results = Mute.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]) - accounts = Account.where(id: results.map(&:target_account_id)).map { |a| [a.id, a] }.to_h - @accounts = results.map { |f| accounts[f.target_account_id] } + @accounts = Account.includes(:muting) + .references(:muting) + .merge(Mute.where(account: current_account) + .paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])) + .to_a - next_path = api_v1_mutes_url(pagination_params(max_id: results.last.id)) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) - prev_path = api_v1_mutes_url(pagination_params(since_id: results.first.id)) unless results.empty? + next_path = api_v1_mutes_url(pagination_params(max_id: @accounts.last.mutings.last.id)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) + prev_path = api_v1_mutes_url(pagination_params(since_id: @accounts.first.mutings.first.id)) unless @accounts.empty? set_pagination_headers(next_path, prev_path) end |