hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix previously OStatus-based accounts not being detected as ActivityPub (#13129)

signup-info-prompt
ThibG 2020-02-22 01:26:41 +01:00 committed by GitHub
parent 89a9eeb675
commit 983ab40086
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_account_service.rb
View File

@ -99,7 +99,7 @@ class ResolveAccountService < BaseService
if lock.acquired? if lock.acquired?
@account = Account.find_remote(@username, @domain) @account = Account.find_remote(@username, @domain)
next if (@account.present? && !@account.activitypub?) || actor_json.nil? next if actor_json.nil?
@account = ActivityPub::ProcessAccountService.new.call(@username, @domain, actor_json) @account = ActivityPub::ProcessAccountService.new.call(@username, @domain, actor_json)
else else