diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-24 21:56:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 21:56:06 +0100 |
| commit | f8da0dd4907490f57cb14b052b767c66c95c4db3 (patch) | |
| tree | 871a1b902872d22d0c28e96dbc733533d33ac397 /app/controllers/api/v1/notifications_controller.rb | |
| parent | bf0f6eb62d0f5bd1f0d8e4e2a6e9e8fd3b297b6c (diff) | |
| parent | 8a880a3d464daf486a10d85b8ee49305aa6b1e5b (diff) | |
Merge branch 'master' into master
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) |