Fixes #3605 by returning account from database in case of race condition (#3606)

8 years ago · 38f03f6da4
parent 5da41e0cae
commit 38f03f6da4
1 changed files with 7 additions and 2 deletions
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/follow_remote_account_service.rb
@ -61,8 +61,13 @@ class FollowRemoteAccountService < BaseService
    account.uri     = get_account_uri(xml)
    account.hub_url = hubs.first.attribute('href').value

-    account.save!
-    get_profile(body, account)
+    begin
+      account.save!
+      get_profile(body, account)
+    rescue ActiveRecord::RecordNotUnique
+      # The account has been added by another worker!
+      return Account.find_remote(confirmed_username, confirmed_domain)
+    end

    account
  end