about summary refs log tree commit diff
path: root/app/controllers/api/v1/favourites_controller.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-01-24 04:22:10 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-01-24 04:22:10 +0100
commit1f5792c83475aed785cdd8eb148aa4fdc53b5671 (patch)
treea39cce012aaf4c301ae052f2e443e98f7e2a8cbb /app/controllers/api/v1/favourites_controller.rb
parentd9022884c6c4e066b1e6ee8d9c07c220c031454e (diff)
API now respects ?limit param as long as it's within 2x default limit
Diffstat (limited to 'app/controllers/api/v1/favourites_controller.rb')
-rw-r--r--app/controllers/api/v1/favourites_controller.rb4
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)