From aac506bd4e37a4adf275f600efa134b682b136aa Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Sat, 9 Jan 2021 14:33:01 -0500
Subject: [PATCH] Removed all usage of unused MergeWorker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Removed:
- all usage of unused MergeWorker
---
 app/models/follow_request.rb     | 1 -
 app/services/follow_service.rb   | 2 --
 app/services/unfollow_service.rb | 1 -
 app/services/unmute_service.rb   | 2 --
 4 files changed, 6 deletions(-)

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