Merge pull request #3789 from pixelfed/staging

Staging

CHANGELOG.md

@@ -18,6 +18,7 @@
 - Update federation config, enable remote follows by default ([59702d40](https://github.com/pixelfed/pixelfed/commit/59702d40))
 - Update ApiV1Controller, fix followAccountById with firstOrCreate() ([1d52ad0b](https://github.com/pixelfed/pixelfed/commit/1d52ad0b))
 - Update AccountService, fix delete status ([8b7121f9](https://github.com/pixelfed/pixelfed/commit/8b7121f9))
+- Update ap helpers, fix duplicate entry bug ([85cfa1ba](https://github.com/pixelfed/pixelfed/commit/85cfa1ba))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

app/Util/ActivityPub/Helpers.php

@@ -742,10 +742,10 @@ class Helpers {
 				[
 					'domain' => strtolower($domain),
 					'username' => Purify::clean($webfinger),
-					'webfinger' => Purify::clean($webfinger),
-					'key_id' => $res['publicKey']['id'],
 				],
 				[
+					'webfinger' => Purify::clean($webfinger),
+					'key_id' => $res['publicKey']['id'],
 					'remote_url' => $res['id'],
 					'name' => isset($res['name']) ? Purify::clean($res['name']) : 'user',
 					'bio' => isset($res['summary']) ? Purify::clean($res['summary']) : null,