diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-08 23:39:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-08 23:39:31 +0200 |
commit | b89f007862bb06bbf892c4f37dbc31ed83138b53 (patch) | |
tree | a2052b0ef9fc554ef9a7049a3c16ed78a08dbd26 /app/controllers/api/v1/favourites_controller.rb | |
parent | 9acdb166e8871632f592bfcd2386dfc288d81a07 (diff) |
Make public timelines API not require user context/app credentials (#1291)
* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public Fix #1156 - respect query params when generating pagination links in API * Apply pagination fix to more APIs
Diffstat (limited to 'app/controllers/api/v1/favourites_controller.rb')
-rw-r--r-- | app/controllers/api/v1/favourites_controller.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb index 8a5b81e63..22b93fe79 100644 --- a/app/controllers/api/v1/favourites_controller.rb +++ b/app/controllers/api/v1/favourites_controller.rb @@ -11,11 +11,16 @@ class Api::V1::FavouritesController < ApiController @statuses = cache_collection(Status.where(id: results.map(&:status_id)), Status) set_maps(@statuses) - # set_counters_maps(@statuses) - next_path = api_v1_favourites_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_STATUSES_LIMIT) - prev_path = api_v1_favourites_url(since_id: results.first.id) unless results.empty? + next_path = api_v1_favourites_url(pagination_params(max_id: results.last.id)) if results.size == limit_param(DEFAULT_STATUSES_LIMIT) + prev_path = api_v1_favourites_url(pagination_params(since_id: results.first.id)) unless results.empty? set_pagination_headers(next_path, prev_path) end + + private + + def pagination_params(core_params) + params.permit(:limit).merge(core_params) + end end |