diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-29 00:04:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-29 00:04:42 +0200 |
| commit | 252deefe3433d0cedafd973becd0d85b5182eb49 (patch) | |
| tree | e20d8fdf6a646d024206333e450fad06d5c4b535 /app/controllers/api | |
| parent | 78f7f23ad21359893cb022b7c2f7644d5c22cb43 (diff) | |
| parent | 01c2f47b7f397af362504a64d850b0eed0b4575f (diff) | |
Merge pull request #1757 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/bookmarks_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/favourites_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb index aa3fb88f0..0cc231840 100644 --- a/app/controllers/api/v1/bookmarks_controller.rb +++ b/app/controllers/api/v1/bookmarks_controller.rb @@ -21,7 +21,7 @@ class Api::V1::BookmarksController < Api::BaseController end def results - @_results ||= account_bookmarks.eager_load(:status).to_a_paginated_by_id( + @_results ||= account_bookmarks.joins(:status).eager_load(:status).to_a_paginated_by_id( limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id) ) diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb index 21836bc17..2a873696c 100644 --- a/app/controllers/api/v1/favourites_controller.rb +++ b/app/controllers/api/v1/favourites_controller.rb @@ -21,7 +21,7 @@ class Api::V1::FavouritesController < Api::BaseController end def results - @_results ||= account_favourites.eager_load(:status).to_a_paginated_by_id( + @_results ||= account_favourites.joins(:status).eager_load(:status).to_a_paginated_by_id( limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id) ) |