mastofe

commit: 9381a7d9d55ea734d6c498a82d17d73fd02fbe87
parent: a5c6c748e096f61d00bbd778a263e22117e1ae9f
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 20 Mar 2018 14:57:46 +0100

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

See also: #6837, #6667
Diffstat:
M
app/services/activitypub/process_account_service.rb
2
+-

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