Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.
This commit is contained in:
@@ -9,6 +9,8 @@ class Form::AccountBatch
|
||||
|
||||
def save
|
||||
case action
|
||||
when 'follow'
|
||||
follow!
|
||||
when 'unfollow'
|
||||
unfollow!
|
||||
when 'remove_from_followers'
|
||||
@@ -24,6 +26,12 @@ class Form::AccountBatch
|
||||
|
||||
private
|
||||
|
||||
def follow!
|
||||
accounts.find_each do |target_account|
|
||||
FollowService.new.call(current_account, target_account)
|
||||
end
|
||||
end
|
||||
|
||||
def unfollow!
|
||||
accounts.find_each do |target_account|
|
||||
UnfollowService.new.call(current_account, target_account)
|
||||
|
||||
Reference in New Issue
Block a user