diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-05-23 20:12:19 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-23 13:12:19 +0200 |
| commit | bf575a1f5e45515733c8c518182bbb0a3c439920 (patch) | |
| tree | a26a2f3adc19a816577002ca42bdba5c80f2aebc /app | |
| parent | 860ffc05602b148769b87d0cda39985feb9a8486 (diff) | |
Introduce recent to Follow (#3247)
Introduce recent to Follow, as Account and other models have. This change also adds specs for the scope and the dependents.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/follower_accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/following_accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/follow.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb index d56bd2a4d..1e7c7c406 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 - @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 diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb index 925647864..f4488eef5 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 - @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 diff --git a/app/models/follow.rb b/app/models/follow.rb index 863710f5d..62f6fb670 100644 --- a/app/models/follow.rb +++ b/app/models/follow.rb @@ -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 |