diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-21 17:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-21 17:17:20 +0000 |
| commit | 6290cd796937e8bfb43ab360a578ac42f53afda9 (patch) | |
| tree | 5123d546ae516640c57c1d4f1047663e8c733343 /app/services | |
| parent | 2649cce3a065f3825d63b7f7be341787aa1d2f9a (diff) | |
| parent | d97903a3587e137316adbd8a9f0460552b5bfbcd (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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 |