tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ThibG 2017-06-08 13:40:11 +02:00 committed by Eugen Rochko
parent 0a0b9a271a
commit f741673638
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/services/follow_remote_account_service.rb
View File

@ -61,8 +61,13 @@ class FollowRemoteAccountService < BaseService
account.uri = get_account_uri(xml) account.uri = get_account_uri(xml)
account.hub_url = hubs.first.attribute('href').value account.hub_url = hubs.first.attribute('href').value
account.save! begin
get_profile(body, account) 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 account
end end