diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-30 18:34:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 18:34:51 +0200 |
| commit | f715e8b51612820a18fa307e4465eb0c1a088f86 (patch) | |
| tree | 8137b48a716e05424ca544210d86e91818085ba7 /app/controllers/api/v1/favourites_controller.rb | |
| parent | 30632adf9eda6d83a9b4269f23f11ced5e09cd93 (diff) | |
| parent | a68ec50e4e38898e88a7dcc33bd0032adc946dda (diff) | |
Merge pull request #1411 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/favourites_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/favourites_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb index 3e242905d..71a707d2a 100644 --- a/app/controllers/api/v1/favourites_controller.rb +++ b/app/controllers/api/v1/favourites_controller.rb @@ -17,14 +17,11 @@ class Api::V1::FavouritesController < Api::BaseController end def cached_favourites - cache_collection( - Status.reorder(nil).joins(:favourites).merge(results), - Status - ) + cache_collection(results.map(&:status), Status) end def results - @_results ||= account_favourites.paginate_by_id( + @_results ||= account_favourites.eager_load(:status).paginate_by_id( limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id) ) |