From 102c829f164ec0411df5d4ff33bc8ffe2e7a3dc0 Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Sat, 6 May 2017 11:03:07 +0900 Subject: [PATCH] Optimize follower_accounts and following_accounts (#2820) --- app/controllers/follower_accounts_controller.rb | 2 +- app/controllers/following_accounts_controller.rb | 2 +- app/views/accounts/_follow_grid.html.haml | 2 +- app/views/follower_accounts/index.html.haml | 2 +- app/views/following_accounts/index.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb index 25c7a893a0..d56bd2a4dd 100644 --- a/app/controllers/follower_accounts_controller.rb +++ b/app/controllers/follower_accounts_controller.rb @@ -4,6 +4,6 @@ class FollowerAccountsController < ApplicationController include AccountControllerConcern def index - @accounts = @account.followers.page(params[:page]).per(FOLLOW_PER_PAGE) + @follows = Follow.where(target_account: @account).order(id: :desc).page(params[:page]).per(FOLLOW_PER_PAGE).preload(:account) end end diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb index 0a80626809..9256478644 100644 --- a/app/controllers/following_accounts_controller.rb +++ b/app/controllers/following_accounts_controller.rb @@ -4,6 +4,6 @@ class FollowingAccountsController < ApplicationController include AccountControllerConcern def index - @accounts = @account.following.page(params[:page]).per(FOLLOW_PER_PAGE) + @follows = Follow.where(account: @account).order(id: :desc).page(params[:page]).per(FOLLOW_PER_PAGE).preload(:target_account) end end diff --git a/app/views/accounts/_follow_grid.html.haml b/app/views/accounts/_follow_grid.html.haml index 322a0ebf4e..10fbfa546d 100644 --- a/app/views/accounts/_follow_grid.html.haml +++ b/app/views/accounts/_follow_grid.html.haml @@ -4,4 +4,4 @@ - else = render partial: 'accounts/grid_card', collection: accounts, as: :account, cached: true -= paginate accounts += paginate follows diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml index ee62c79ebf..89c7f3a294 100644 --- a/app/views/follower_accounts/index.html.haml +++ b/app/views/follower_accounts/index.html.haml @@ -6,4 +6,4 @@ = render 'accounts/header', account: @account -= render 'accounts/follow_grid', accounts: @accounts += render 'accounts/follow_grid', follows: @follows, accounts: @follows.map(&:account) diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml index 68a0ef8389..6f0de7590b 100644 --- a/app/views/following_accounts/index.html.haml +++ b/app/views/following_accounts/index.html.haml @@ -6,4 +6,4 @@ = render 'accounts/header', account: @account -= render 'accounts/follow_grid', accounts: @accounts += render 'accounts/follow_grid', follows: @follows, accounts: @follows.map(&:target_account)