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

Origin-Creative · Mar 24, 2019 · ec012eb · ec012eb
1 parent 606ada5
commit ec012eb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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