diff options
| author | Starfall <admin@plural.cafe> | 2020-06-19 13:14:45 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-06-19 13:14:45 -0500 |
| commit | 5668836f56cddf3257f38a2483c1d42cacbad3a8 (patch) | |
| tree | c241a44562f79ccecaf215eb572c22d559b08dd1 /app/controllers/accounts_controller.rb | |
| parent | 76f79dd29909d39f1d36ef48e6892223d59e29d7 (diff) | |
| parent | c7da2cc5a1821e589e7241aec21d8bb426722c2a (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/accounts_controller.rb')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index e3d8c1061..b8bca580f 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true class AccountsController < ApplicationController - PAGE_SIZE = 20 + PAGE_SIZE = 20 + PAGE_SIZE_MAX = 200 include AccountControllerConcern include SignatureAuthentication @@ -27,7 +28,7 @@ class AccountsController < ApplicationController return end - @pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses? + @pinned_statuses = cache_collection(@account.pinned_statuses.not_local_only, Status) if show_pinned_statuses? @statuses = filtered_status_page @statuses = cache_collection(@statuses, Status) @rss_url = rss_url @@ -41,7 +42,8 @@ class AccountsController < ApplicationController format.rss do expires_in 1.minute, public: true - @statuses = filtered_statuses.without_reblogs.limit(PAGE_SIZE) + limit = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE + @statuses = filtered_statuses.without_reblogs.limit(limit) @statuses = cache_collection(@statuses, Status) render xml: RSS::AccountSerializer.render(@account, @statuses, params[:tag]) end |