Fix MergeWorker being queued for remote users (#10355)

6 years ago · 45b849bad9
parent 0f9278c3d3
commit 45b849bad9
1 changed files with 1 additions and 1 deletions
--- 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