tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce recent to Follow (#3247)

Browse Source 
Introduce recent to Follow, as Account and other models have.
This change also adds specs for the scope and the dependents.
This commit is contained in:
Akihiko Odaki
2017-05-23 20:12:19 +09:00
committed by Eugen Rochko
parent 860ffc0560
commit bf575a1f5e
6 changed files with 41 additions and 6 deletions
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
@follows = Follow.where(target_account: @account).order(id: :desc).page(params[:page]).per(FOLLOW_PER_PAGE).preload(:account)
@follows = Follow.where(target_account: @account).recent.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
@follows = Follow.where(account: @account).order(id: :desc).page(params[:page]).per(FOLLOW_PER_PAGE).preload(:target_account)
@follows = Follow.where(account: @account).recent.page(params[:page]).per(FOLLOW_PER_PAGE).preload(:target_account)
end
end

2
app/models/follow.rb
View File

@ -23,4 +23,6 @@ class Follow < ApplicationRecord
has_one :notification, as: :activity, dependent: :destroy
validates :account_id, uniqueness: { scope: :target_account_id }
scope :recent, -> { reorder(id: :desc) }
end