about summary refs log tree commit diff
path: root/app/controllers/api_controller.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-22 21:34:19 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-22 21:34:19 +0100
commit2d2154ba75279186b064c887452b7d6ee70b8ba2 (patch)
treee27a84e2245184c899f2b347d63af16210973660 /app/controllers/api_controller.rb
parentf91b6fa9e15029f23be7be3b796eca122e5b5588 (diff)
Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
Diffstat (limited to 'app/controllers/api_controller.rb')
-rw-r--r--app/controllers/api_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index d2d3bc4a4..8f1c8ac8a 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -30,6 +30,10 @@ class ApiController < ApplicationController
     render json: { error: 'Remote SSL certificate could not be verified' }, status: 503
   end
 
+  rescue_from Mastodon::NotPermitted do
+    render json: { error: 'This action is not allowed' }, status: 403
+  end
+
   def doorkeeper_unauthorized_render_options(error: nil)
     { json: { error: (error.try(:description) || 'Not authorized') } }
   end