diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-18 23:26:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 23:26:26 +0100 |
| commit | a60d9335d8e7c4aa070f081719ee2a438b0e0202 (patch) | |
| tree | 1ec5e4628240a3eb7bf3d16e310adb48775de05d /app/services/activitypub/fetch_remote_account_service.rb | |
| parent | 052249588b77fe3d8e29658076eb385f64511d6b (diff) | |
Fix resolving accounts sometimes creating duplicate records for a given AP id (#15364)
* Fix ResolveAccountService accepting mismatching acct: URI * Set attributes that should be updated regardless of suspension * Fix key fetching * Automatically merge remote accounts with duplicate `uri` * Add tests * Add "tootctl accounts fix-duplicates" Finds duplicate accounts sharing a same ActivityPub `id`, re-fetch them and merge them under the canonical `acct:` URI. Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Diffstat (limited to 'app/services/activitypub/fetch_remote_account_service.rb')
| -rw-r--r-- | app/services/activitypub/fetch_remote_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb index e5bd0c47c..9d01f5386 100644 --- a/app/services/activitypub/fetch_remote_account_service.rb +++ b/app/services/activitypub/fetch_remote_account_service.rb @@ -28,7 +28,7 @@ class ActivityPub::FetchRemoteAccountService < BaseService return unless only_key || verified_webfinger? - ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key) + ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key, verified_webfinger: !only_key) rescue Oj::ParseError nil end |