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/accounts_controller.rb | |
parent | d972845ff663605becec1dde904271897fe2e347 (diff) |
Use joins for account properties (#3167)
Diffstat (limited to 'app/controllers/api/v1/accounts_controller.rb')
-rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index 12c7dd2b0..664ac0ba5 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -23,12 +23,14 @@ class Api::V1::AccountsController < ApiController end def following - results = Follow.where(account: @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(:followers) + .references(:followers) + .merge(Follow.where(account: @account) + .paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])) + .to_a - next_path = following_api_v1_account_url(pagination_params(max_id: results.last.id)) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) - prev_path = following_api_v1_account_url(pagination_params(since_id: results.first.id)) unless results.empty? + next_path = following_api_v1_account_url(pagination_params(max_id: @accounts.last.followers.last.id)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) + prev_path = following_api_v1_account_url(pagination_params(since_id: @accounts.first.followers.first.id)) unless @accounts.empty? set_pagination_headers(next_path, prev_path) @@ -36,12 +38,16 @@ class Api::V1::AccountsController < ApiController end def followers - results = Follow.where(target_account: @account).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]) - accounts = Account.where(id: results.map(&:account_id)).map { |a| [a.id, a] }.to_h - @accounts = results.map { |f| accounts[f.account_id] } - - next_path = followers_api_v1_account_url(pagination_params(max_id: results.last.id)) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) - prev_path = followers_api_v1_account_url(pagination_params(since_id: results.first.id)) unless results.empty? + @accounts = Account.includes(:following) + .references(:following) + .merge(Follow.where(target_account: @account) + .paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), + params[:max_id], + params[:since_id])) + .to_a + + next_path = followers_api_v1_account_url(pagination_params(max_id: @accounts.last.following.last.id)) if @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) + prev_path = followers_api_v1_account_url(pagination_params(since_id: @accounts.first.following.first.id)) unless @accounts.empty? set_pagination_headers(next_path, prev_path) |