diff options
| author | Starfall <us@starfall.systems> | 2022-04-29 09:20:51 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-04-29 09:20:51 -0500 |
| commit | 4eb291e5db6114c8aa564f0c9e7f04d13805b5cc (patch) | |
| tree | 1a6affcf635974ccf6d0f650a3bbe2be75c7929e /app/controllers/api/v1 | |
| parent | bcaacc42334d75bd361f330989041a9beba101a9 (diff) | |
| parent | 252deefe3433d0cedafd973becd0d85b5182eb49 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/controllers/api/v1')
| -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) ) |