diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-02-25 14:28:13 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-25 14:28:13 +0100 |
| commit | 85933bc9ff5869e69403315a30c3027d59c7e60d (patch) | |
| tree | ea2bab292d7fdc97f529aa447300017c4ede00af /app/services/resolve_account_service.rb | |
| parent | 0d41fef50618e3d58255b4f4082326e83ff06982 (diff) | |
| parent | 7face973fa1c7d6c18b06d427ea0b7a741d11466 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services/resolve_account_service.rb')
| -rw-r--r-- | app/services/resolve_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb index 12e6544a0..1ad9ed407 100644 --- a/app/services/resolve_account_service.rb +++ b/app/services/resolve_account_service.rb @@ -99,7 +99,7 @@ class ResolveAccountService < BaseService if lock.acquired? @account = Account.find_remote(@username, @domain) - next if (@account.present? && !@account.activitypub?) || actor_json.nil? + next if actor_json.nil? @account = ActivityPub::ProcessAccountService.new.call(@username, @domain, actor_json) else |