]> cat aescling's git repositories - mastodon.git/commitdiff
Fix previously OStatus-based accounts not being detected as ActivityPub (#13129)
authorThibG <thib@sitedethib.com>
Sat, 22 Feb 2020 00:26:41 +0000 (01:26 +0100)
committerGitHub <noreply@github.com>
Sat, 22 Feb 2020 00:26:41 +0000 (01:26 +0100)
app/services/resolve_account_service.rb

index 12e6544a0f6d3ab4ed035bc206cfb27d4db9e4f5..1ad9ed4071031c3dc0782ff36aee8b8a21be9ff6 100644 (file)
@@ -99,7 +99,7 @@ class ResolveAccountService < BaseService
       if lock.acquired?
         @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)
       else