about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authoraschmitz <aschmitz@lardbucket.org>2017-11-09 08:41:10 -0600
committeraschmitz <aschmitz@lardbucket.org>2017-11-09 08:41:10 -0600
commit49445150202f0bdaae942b9ae1ba44802a1c22e9 (patch)
tree5d305bb395d7e61ec6b2f0e4b48229ebf216be8d /app/controllers
parent870d71b78be74b7fab4892a79a87aff39b1e2726 (diff)
"Show reblogs" per-follower UI/database changes
TODO:

* Tests (particularly for FollowRequests).
* Anything to respect the setting when putting reblogs in timelines.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/accounts_controller.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 4676f60de..afdbf6e2d 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -13,9 +13,11 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def follow
-    FollowService.new.call(current_user.account, @account.acct)
+    reblogs_arg = { reblogs: params[:reblogs] }
+    
+    FollowService.new.call(current_user.account, @account.acct, reblogs_arg)
 
-    options = @account.locked? ? {} : { following_map: { @account.id => true }, requested_map: { @account.id => false } }
+    options = @account.locked? ? {} : { following_map: reblogs_arg, requested_map: { @account.id => false } }
 
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
   end