mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eugen Rochko 2017-12-09 01:24:47 +01:00 committed by GitHub
parent c36b9cc5a6
commit 86b4d5439c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/resolve_remote_account_service.rb
View File

@ -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