diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-02 12:01:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 12:01:40 +0200 |
| commit | 35e9d099b3febd75d1613dfc8a494e769a98c3a6 (patch) | |
| tree | 2aceaee757bd292e3d05811673a7bfe419e7b064 /app/controllers/api/v1/timelines/public_controller.rb | |
| parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
| parent | 6ad76069096005d7b55d9c63a567f843997a8068 (diff) | |
Merge pull request #758 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/timelines/public_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index 13fe015b7..aabe24324 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -21,10 +21,9 @@ class Api::V1::Timelines::PublicController < Api::BaseController end def public_statuses - statuses = public_timeline_statuses.paginate_by_max_id( + statuses = public_timeline_statuses.paginate_by_id( limit_param(DEFAULT_STATUSES_LIMIT), - params[:max_id], - params[:since_id] + params_slice(:max_id, :since_id, :min_id) ) if truthy_param?(:only_media) @@ -53,7 +52,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController end def prev_path - api_v1_timelines_public_url pagination_params(since_id: pagination_since_id) + api_v1_timelines_public_url pagination_params(min_id: pagination_since_id) end def pagination_max_id |