diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-20 14:57:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 14:57:46 +0100 |
| commit | 9381a7d9d55ea734d6c498a82d17d73fd02fbe87 (patch) | |
| tree | f3cf8a332c80703eb2570eb9d4c156c508f9e784 /app/services | |
| parent | a5c6c748e096f61d00bbd778a263e22117e1ae9f (diff) | |
Use username/domain to match existing accounts in ActivityPub (#6842)
See also: #6837, #6667
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |