autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v3.1.2' into hometown-dev

Browse Source
This commit is contained in:
Darius Kazemi
2020-03-02 10:01:54 -08:00
parent 513f13e0c1 aa8568b7f2
commit 3f20f4a4ba
33 changed files with 571 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/services/activitypub/process_account_service.rb
View File

@ -20,9 +20,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