about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-12-09 01:24:47 +0100
committerGitHub <noreply@github.com>2017-12-09 01:24:47 +0100
commit86b4d5439caf717fc549a6036ca50a661badbd55 (patch)
treefb4a31a014a968b2071dab4de5830ac7a44e2464 /app/services
parentc36b9cc5a6cf3feacb925213f5530c90dd31fa7a (diff)
Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929)
Diffstat (limited to 'app/services')
-rw-r--r--app/services/resolve_remote_account_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_remote_account_service.rb
index 3293fe40f..d7d0be210 100644
--- 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