diff options
| author | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-04-11 20:04:46 -0500 |
| commit | 144ecfcfc7d9974117f1563084409a9558290a60 (patch) | |
| tree | a26bd8374e4b8264dbae815fbfbd3b91ae51450b /app/services/resolve_account_service.rb | |
| parent | 12d35783db1bb302d7540d8d3690ab6eed3dac3b (diff) | |
Revert "Revert "Merge branch 'glitch'""
This reverts commit 12d35783db1bb302d7540d8d3690ab6eed3dac3b.
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 |