]> cat aescling's git repositories - mastodon.git/commitdiff
Fix MergeWorker being queued for remote users (#10355)
authorEugen Rochko <eugen@zeonfederated.com>
Sun, 24 Mar 2019 11:36:26 +0000 (12:36 +0100)
committerGitHub <noreply@github.com>
Sun, 24 Mar 2019 11:36:26 +0000 (12:36 +0100)
app/models/follow_request.rb

index c5451a0507ac58df3894a9796ba13cdcee4b8731..96ac7eaa593d9fac53f30d3a9444c7ba3d30ea99 100644 (file)
@@ -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