diff options
| author | Starfall <us@starfall.systems> | 2020-08-31 12:28:25 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-08-31 12:28:25 -0500 |
| commit | c5bb91194f0df90ea9c59ea6af1bd985b295fb30 (patch) | |
| tree | 47b303b2c64ff1920fb19d01093a08dc9fd20ac8 /app/controllers/api/v1/bookmarks_controller.rb | |
| parent | 27ee0fc8c4c13c53f81ca3db781b9d0783b877e5 (diff) | |
| parent | f715e8b51612820a18fa307e4465eb0c1a088f86 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/api/v1/bookmarks_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/bookmarks_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb index c15212f0a..5c72f4a1a 100644 --- a/app/controllers/api/v1/bookmarks_controller.rb +++ b/app/controllers/api/v1/bookmarks_controller.rb @@ -17,14 +17,11 @@ class Api::V1::BookmarksController < Api::BaseController end def cached_bookmarks - cache_collection( - Status.reorder(nil).joins(:bookmarks).merge(results), - Status - ) + cache_collection(results.map(&:status), Status) end def results - @_results ||= account_bookmarks.paginate_by_id( + @_results ||= account_bookmarks.eager_load(:status).paginate_by_id( limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id) ) |