Browse Source

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

master
ThibG 7 years ago
committed by Eugen Rochko
parent
commit
f741673638
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      app/services/follow_remote_account_service.rb

+ 7
- 2
app/services/follow_remote_account_service.rb View File

@ -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

Loading…
Cancel
Save