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

See also: #6837, #6667
2018-03-20 14:57:46 +01:00 · 2018-03-20 14:57:46 +01:00 · ab96a9ff11
parent ca370217ad
commit ab96a9ff11
1 changed files with 1 additions and 1 deletions
--- 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