diff options
author | ThibG <thib@sitedethib.com> | 2020-02-25 18:05:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-25 18:05:52 +0100 |
commit | 9ee8e1add9f937a75c2514ca88958ff02cf5573c (patch) | |
tree | e6c97dfd5a14860b9c825b1c84fb1dd84ada6581 /app/services/activitypub/process_account_service.rb | |
parent | 0d41fef50618e3d58255b4f4082326e83ff06982 (diff) | |
parent | 2f2b48b227304d0f0a28dd4867e84af10b8097ad (diff) |
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index cef658e19..d5ede0388 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -18,9 +18,10 @@ class ActivityPub::ProcessAccountService < BaseService RedisLock.acquire(lock_options) do |lock| if lock.acquired? - @account = Account.find_remote(@username, @domain) - @old_public_key = @account&.public_key - @old_protocol = @account&.protocol + @account = Account.remote.find_by(uri: @uri) if @options[:only_key] + @account ||= Account.find_remote(@username, @domain) + @old_public_key = @account&.public_key + @old_protocol = @account&.protocol create_account if @account.nil? update_account |