diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/notifications_controller.rb | 17 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb new file mode 100644 index 000000000..509471f61 --- /dev/null +++ b/app/controllers/api/v1/notifications_controller.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class Api::V1::NotificationsController < ApiController + before_action -> { doorkeeper_authorize! :read } + before_action :require_user! + + respond_to :json + + def index + @notifications = Notification.where(account: current_account).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) + + next_path = api_v1_notifications_url(max_id: @notifications.last.id) if @notifications.size == 20 + prev_path = api_v1_notifications_url(since_id: @notifications.first.id) unless @notifications.empty? + + set_pagination_headers(next_path, prev_path) + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f9aeb127a..3a4c95db4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base rescue_from ActiveRecord::RecordNotFound, with: :not_found before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? - before_action :set_locale, if: 'user_signed_in?' + before_action :set_locale def raise_not_found raise ActionController::RoutingError, "No route matches #{params[:unmatched_route]}" @@ -26,7 +26,7 @@ class ApplicationController < ActionController::Base end def set_locale - I18n.locale = current_user.locale || I18n.default_locale + I18n.locale = current_user.try(:locale) || I18n.default_locale rescue I18n::InvalidLocale I18n.locale = I18n.default_locale end |