about summary refs log tree commit diff
path: root/app/services/follow_remote_account_service.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2017-06-15 11:04:23 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-06-15 11:04:23 +0200
commit51b2f789bd1d6d4e00f02f5476ff7e6af25fce49 (patch)
tree27003842b7b89185038d986ec77610d9498d8667 /app/services/follow_remote_account_service.rb
parent947887f261f74f84312327a5265553e8f16655fe (diff)
Fix #3633 by not spawning RemoteProfileUpdateWorker from FetchRemoteAccountService (#3642)
Diffstat (limited to 'app/services/follow_remote_account_service.rb')
-rw-r--r--app/services/follow_remote_account_service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb
index 8558e6d02..30ba7bc75 100644
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/follow_remote_account_service.rb
@@ -11,7 +11,7 @@ class FollowRemoteAccountService < BaseService
   # important information from their feed
   # @param [String] uri User URI in the form of username@domain
   # @return [Account]
-  def call(uri, redirected = nil)
+  def call(uri, update_profile = true, redirected = nil)
     username, domain = uri.split('@')
 
     return Account.find_local(username) if TagManager.instance.local_domain?(domain)
@@ -29,7 +29,7 @@ class FollowRemoteAccountService < BaseService
     confirmed_username, confirmed_domain = data.subject.gsub(/\Aacct:/, '').split('@')
 
     unless confirmed_username.casecmp(username).zero? && confirmed_domain.casecmp(domain).zero?
-      return call("#{confirmed_username}@#{confirmed_domain}", true) if redirected.nil?
+      return call("#{confirmed_username}@#{confirmed_domain}", update_profile, true) if redirected.nil?
       raise Goldfinger::Error, 'Requested and returned acct URI do not match'
     end
 
@@ -63,7 +63,7 @@ class FollowRemoteAccountService < BaseService
 
     begin
       account.save!
-      get_profile(body, account)
+      get_profile(body, account) if update_profile
     rescue ActiveRecord::RecordNotUnique
       # The account has been added by another worker!
       return Account.find_remote(confirmed_username, confirmed_domain)