diff options
Diffstat (limited to 'app/services/unfollow_service.rb')
-rw-r--r-- | app/services/unfollow_service.rb | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb index bf151ee28..73a64929f 100644 --- a/app/services/unfollow_service.rb +++ b/app/services/unfollow_service.rb @@ -5,14 +5,34 @@ class UnfollowService < BaseService # @param [Account] source_account Where to unfollow from # @param [Account] target_account Which to unfollow def call(source_account, target_account) - follow = source_account.unfollow!(target_account) + @source_account = source_account + @target_account = target_account + + unfollow! || undo_follow_request! + end + + private + + def unfollow! + follow = Follow.find_by(account: @source_account, target_account: @target_account) + return unless follow - create_notification(follow) unless target_account.local? - UnmergeWorker.perform_async(target_account.id, source_account.id) + + follow.destroy! + create_notification(follow) unless @target_account.local? + UnmergeWorker.perform_async(@target_account.id, @source_account.id) follow end - private + def undo_follow_request! + follow_request = FollowRequest.find_by(account: @source_account, target_account: @target_account) + + return unless follow_request + + follow_request.destroy! + create_notification(follow_request) unless @target_account.local? + follow_request + end def create_notification(follow) if follow.target_account.ostatus? |