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

See also: #6837, #6667

Use username/domain to match existing accounts in ActivityPub (#6842)
See also: #6837, #6667
9381a7d9 · Eugen Rochko · GitHub · a5c6c748 · 9381a7d9
Unverified Commit 9381a7d9 authored 7 years ago by Eugen Rochko Committed by GitHub 7 years ago
--- 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