Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929)

2017-12-09 01:24:47 +01:00 · 2017-12-09 01:24:47 +01:00 · 856e8465ea
parent 46cce9ee4b
commit 856e8465ea
1 changed files with 1 additions and 1 deletions
--- a/app/services/resolve_remote_account_service.rb
+++ b/app/services/resolve_remote_account_service.rb
@ -44,7 +44,7 @@ class ResolveRemoteAccountService < BaseService
      if lock.acquired?
        @account = Account.find_remote(@username, @domain)

-        if activitypub_ready?
+        if activitypub_ready? || @account&.activitypub?
          handle_activitypub
        else
          handle_ostatus