From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 9 Dec 2017 00:24:47 +0000 (+0100)
Subject: Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=86b4d5439caf717fc549a6036ca50a661badbd55;p=mastodon.git

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

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