diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-09-30 12:25:13 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-09-30 12:25:13 -0500 |
| commit | 22e7a7947900cc974715b0c9d1d6b1a44d2ed1eb (patch) | |
| tree | 918ab95c4f465c9c1fbfcd6706483e3310a38ce5 /app/controllers/api/v1/lists | |
| parent | 63046c8cb9df8e797d53566f2050313d757b089b (diff) | |
| parent | b5edf30160eab3776e44b34325a4ea00d9f71dc5 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/controllers/api/v1/lists')
| -rw-r--r-- | app/controllers/api/v1/lists/accounts_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb index 23078263e..b66ea9bfe 100644 --- a/app/controllers/api/v1/lists/accounts_controller.rb +++ b/app/controllers/api/v1/lists/accounts_controller.rb @@ -37,9 +37,9 @@ class Api::V1::Lists::AccountsController < Api::BaseController def load_accounts if unlimited? - @list.accounts.includes(:account_stat).all + @list.accounts.without_suspended.includes(:account_stat).all else - @list.accounts.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]) + @list.accounts.without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id]) end end |