diff options
| author | Starfall <root@starfall.blue> | 2020-03-01 14:49:21 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-03-01 14:49:21 -0600 |
| commit | 12d35783db1bb302d7540d8d3690ab6eed3dac3b (patch) | |
| tree | 66f1db08a2f6f9ae2254ba7a81b71835039d671e /app/services/resolve_account_service.rb | |
| parent | 22a55edc158352003a3953964c9d332a60c86428 (diff) | |
Revert "Merge branch 'glitch'"
Login is broken This reverts commit 22a55edc158352003a3953964c9d332a60c86428, reversing changes made to 5902299384d15249fe4b84b8761d4a49f3c7f6fd.
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 1ad9ed407..12e6544a0 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 actor_json.nil? + next if (@account.present? && !@account.activitypub?) || actor_json.nil? @account = ActivityPub::ProcessAccountService.new.call(@username, @domain, actor_json) else |