From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 20 Mar 2018 13:57:46 +0000 (+0100)
Subject: Use username/domain to match existing accounts in ActivityPub (#6842)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9381a7d9d55ea734d6c498a82d17d73fd02fbe87;p=mastodon.git

Use username/domain to match existing accounts in ActivityPub (#6842)

See also: #6837, #6667
---

diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 68e9db766..7d8dc1369 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -16,7 +16,7 @@ class ActivityPub::ProcessAccountService < BaseService
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
-        @account        = Account.find_by(uri: @uri)
+        @account        = Account.find_remote(@username, @domain)
         @old_public_key = @account&.public_key
         @old_protocol   = @account&.protocol