mastofe

commit: 86b4d5439caf717fc549a6036ca50a661badbd55
parent: c36b9cc5a6cf3feacb925213f5530c90dd31fa7a
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sat,  9 Dec 2017 01:24:47 +0100

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


Diffstat:
M
app/services/resolve_remote_account_service.rb
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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