diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-24 04:22:10 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-24 04:22:10 +0100 |
commit | 1f5792c83475aed785cdd8eb148aa4fdc53b5671 (patch) | |
tree | a39cce012aaf4c301ae052f2e443e98f7e2a8cbb /app/controllers/api/v1/notifications_controller.rb | |
parent | d9022884c6c4e066b1e6ee8d9c07c220c031454e (diff) |
API now respects ?limit param as long as it's within 2x default limit
Diffstat (limited to 'app/controllers/api/v1/notifications_controller.rb')
-rw-r--r-- | app/controllers/api/v1/notifications_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb index ee12446d8..157a88e14 100644 --- a/app/controllers/api/v1/notifications_controller.rb +++ b/app/controllers/api/v1/notifications_controller.rb @@ -7,7 +7,7 @@ class Api::V1::NotificationsController < ApiController respond_to :json def index - @notifications = Notification.where(account: current_account).browserable.paginate_by_max_id(20, params[:max_id], params[:since_id]) + @notifications = Notification.where(account: current_account).browserable.paginate_by_max_id(limit_param(15), params[:max_id], params[:since_id]) @notifications = cache_collection(@notifications, Notification) statuses = @notifications.select { |n| !n.target_status.nil? }.map(&:target_status) @@ -15,7 +15,7 @@ class Api::V1::NotificationsController < ApiController set_counters_maps(statuses) set_account_counters_maps(@notifications.map(&:from_account)) - next_path = api_v1_notifications_url(max_id: @notifications.last.id) if @notifications.size == 20 + next_path = api_v1_notifications_url(max_id: @notifications.last.id) if @notifications.size == limit_param(15) prev_path = api_v1_notifications_url(since_id: @notifications.first.id) unless @notifications.empty? set_pagination_headers(next_path, prev_path) |