diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 23:10:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 23:10:31 +0200 |
| commit | ab1488a6ad93f572e1d184cb9653f76fd408474f (patch) | |
| tree | f1dd126f4745eb99243f390169fb957a72f5acc6 /app/controllers/api/v1/trends/links_controller.rb | |
| parent | 325ebb76b19bd20e1b76d8bc26c11cab02f6571c (diff) | |
| parent | 6c0d73a675d62f676b005c06593fd69e9a7bc0e5 (diff) | |
Merge pull request #1804 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/trends/links_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/trends/links_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/api/v1/trends/links_controller.rb b/app/controllers/api/v1/trends/links_controller.rb index 2385fe438..1a9f918f2 100644 --- a/app/controllers/api/v1/trends/links_controller.rb +++ b/app/controllers/api/v1/trends/links_controller.rb @@ -13,10 +13,14 @@ class Api::V1::Trends::LinksController < Api::BaseController private + def enabled? + Setting.trends + end + def set_links @links = begin - if Setting.trends - links_from_trends + if enabled? + links_from_trends.offset(offset_param).limit(limit_param(DEFAULT_LINKS_LIMIT)) else [] end @@ -24,7 +28,7 @@ class Api::V1::Trends::LinksController < Api::BaseController end def links_from_trends - Trends.links.query.allowed.in_locale(content_locale).offset(offset_param).limit(limit_param(DEFAULT_LINKS_LIMIT)) + Trends.links.query.allowed.in_locale(content_locale) end def insert_pagination_headers |