luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Optimize follower_accounts and following_accounts (#2820)

Browse source
This commit is contained in:
alpaca-tc 2017-05-06 11:03:07 +09:00 committed by Eugen Rochko
parent 3f5b994ff0
commit ddc34feb58
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/follower_accounts_controller.rb
View file

@ -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

2
app/controllers/following_accounts_controller.rb
View file

@ -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

2
app/views/accounts/_follow_grid.html.haml
View file

@ -4,4 +4,4 @@
- else
= render partial: 'accounts/grid_card', collection: accounts, as: :account, cached: true
= paginate accounts
= paginate follows

2
app/views/follower_accounts/index.html.haml
View file

@ -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)

2
app/views/following_accounts/index.html.haml
View file

@ -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)