diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:23:06 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:23:06 +0100 |
commit | 5f511324b65f94d800dbbd3850214955d7d9eb73 (patch) | |
tree | 5ed179289819d61df1a4c15851389aa7d9b42f19 /app/controllers/api_controller.rb | |
parent | 063432d7e352a0dfb7da0e198886b88e3b8a55bb (diff) |
Add validation of media attachments, clean up mastodon-own exception classes
Diffstat (limited to 'app/controllers/api_controller.rb')
-rw-r--r-- | app/controllers/api_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 5d2bd9a22..c2002cb79 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -10,7 +10,7 @@ class ApiController < ApplicationController before_action :set_rate_limit_headers - rescue_from ActiveRecord::RecordInvalid do |e| + rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| render json: { error: e.to_s }, status: 422 end @@ -30,7 +30,7 @@ class ApiController < ApplicationController render json: { error: 'Remote SSL certificate could not be verified' }, status: 503 end - rescue_from Mastodon::NotPermitted do + rescue_from Mastodon::NotPermittedError do render json: { error: 'This action is not allowed' }, status: 403 end |