Correctly reflect that follow requests weren't auto-accepted when loc…

…al account is silenced
mastodon · Sep 27, 2019 · 62d76a4 · 62d76a4
1 parent a0c7312
commit 62d76a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
@@ -33,7 +33,7 @@ def create
   def follow
     FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs))
 
-    options = @account.locked? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }
+    options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }
 
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
   end