diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-07-05 02:41:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 02:41:40 +0200 |
| commit | 44b2ee3485ba0845e5910cefcb4b1e2f84f34470 (patch) | |
| tree | cc91189c9b36aaf0a04d339455c6d238992753a9 /app/controllers/api/v1/trends/statuses_controller.rb | |
| parent | 1b4054256f9d3302b44f71627a23bb0902578867 (diff) | |
Add customizable user roles (#18641)
* Add customizable user roles * Various fixes and improvements * Add migration for old settings and fix tootctl role management
Diffstat (limited to 'app/controllers/api/v1/trends/statuses_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/trends/statuses_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/api/v1/trends/statuses_controller.rb b/app/controllers/api/v1/trends/statuses_controller.rb index 1f2fff582..c275d5fc8 100644 --- a/app/controllers/api/v1/trends/statuses_controller.rb +++ b/app/controllers/api/v1/trends/statuses_controller.rb @@ -11,10 +11,14 @@ class Api::V1::Trends::StatusesController < Api::BaseController private + def enabled? + Setting.trends + end + def set_statuses @statuses = begin - if Setting.trends - cache_collection(statuses_from_trends, Status) + if enabled? + cache_collection(statuses_from_trends.offset(offset_param).limit(limit_param(DEFAULT_STATUSES_LIMIT)), Status) else [] end @@ -24,7 +28,7 @@ class Api::V1::Trends::StatusesController < Api::BaseController def statuses_from_trends scope = Trends.statuses.query.allowed.in_locale(content_locale) scope = scope.filtered_for(current_account) if user_signed_in? - scope.offset(offset_param).limit(limit_param(DEFAULT_STATUSES_LIMIT)) + scope end def insert_pagination_headers |