diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index baea0536..0464f989 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -26,7 +26,6 @@ class FollowRequest < ApplicationRecord def authorize! account.follow!(target_account) - MergeWorker.perform_async(target_account.id, account.id) if account.local? destroy! end diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 39c9b9bf..fb714f2e 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -54,8 +54,6 @@ class FollowService < BaseService LocalNotificationWorker.perform_async(target_account.id, follow.id, follow.class.name) end - MergeWorker.perform_async(target_account.id, source_account.id) - follow end diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb index e4a6d0a4..b55157f3 100644 --- a/app/services/unfollow_service.rb +++ b/app/services/unfollow_service.rb @@ -19,7 +19,6 @@ class UnfollowService < BaseService return unless follow follow.destroy! - UnmergeWorker.perform_async(@target_account.id, @source_account.id) follow end diff --git a/app/services/unmute_service.rb b/app/services/unmute_service.rb index 6aeea358..ed268b7c 100644 --- a/app/services/unmute_service.rb +++ b/app/services/unmute_service.rb @@ -5,7 +5,5 @@ class UnmuteService < BaseService return unless account.muting?(target_account) account.unmute!(target_account) - - MergeWorker.perform_async(target_account.id, account.id) if account.following?(target_account) end end