diff options
| author | Starfall <root@starfall.blue> | 2020-04-11 20:04:56 -0500 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-04-11 20:04:56 -0500 |
| commit | b107e4f771f036b214563764fcd95786f8016ee7 (patch) | |
| tree | 22397105f42f30eceacdf84671d1c4d807c9dd73 /app/controllers/api/base_controller.rb | |
| parent | 144ecfcfc7d9974117f1563084409a9558290a60 (diff) | |
| parent | c47be5bd864a1f5244f35122ba7fae31a149c73d (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 68bf425f4..153ade253 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -44,6 +44,10 @@ class Api::BaseController < ApplicationController render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503 end + rescue_from Mastodon::RateLimitExceededError do + render json: { error: I18n.t('errors.429') }, status: 429 + end + rescue_from ActionController::ParameterMissing do |e| render json: { error: e.to_s }, status: 400 end |