diff options
author | Eugen <eugen@zeonfederated.com> | 2017-01-24 14:27:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 14:27:13 +0100 |
commit | 4f3264d2912d1b70a22099f1c713691f91ba890d (patch) | |
tree | 8a48ce38d47351bc3739cebd3672d40c98763807 /app/controllers/api/v1/favourites_controller.rb | |
parent | 4a146a0d189280dbd15098f42850ca550e0d7910 (diff) | |
parent | 21c209636d12ea601379e7abd3d370ad0d22ea18 (diff) |
Merge branch 'master' into boostspin
Diffstat (limited to 'app/controllers/api/v1/favourites_controller.rb')
-rw-r--r-- | app/controllers/api/v1/favourites_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb index ea799fd55..ef0a4854a 100644 --- a/app/controllers/api/v1/favourites_controller.rb +++ b/app/controllers/api/v1/favourites_controller.rb @@ -7,13 +7,13 @@ class Api::V1::FavouritesController < ApiController respond_to :json def index - results = Favourite.where(account: current_account).paginate_by_max_id(DEFAULT_STATUSES_LIMIT, params[:max_id], params[:since_id]) + results = Favourite.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id]) @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 == DEFAULT_STATUSES_LIMIT + 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? set_pagination_headers(next_path, prev_path) |