From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 24 Mar 2019 11:36:26 +0000 (+0100)
Subject: Fix MergeWorker being queued for remote users (#10355)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=45b849bad98ffad9ce9ce39f1aa984ca4b7329f9;p=mastodon.git

Fix MergeWorker being queued for remote users (#10355)
---

diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index c5451a050..96ac7eaa5 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -26,7 +26,7 @@ class FollowRequest < ApplicationRecord
 
   def authorize!
     account.follow!(target_account, reblogs: show_reblogs, uri: uri)
-    MergeWorker.perform_async(target_account.id, account.id)
+    MergeWorker.perform_async(target_account.id, account.id) if account.local?
     destroy!
   end