fix(settings): change Mastodon only URI to webfinger

Signed-off-by: 諏訪子 <[email protected]>

AUTHORS

@@ -619,6 +619,7 @@
  - szaimen <[email protected]>
  - tbartenstein <[email protected]>
  - tbelau666 <[email protected]>
+ - TechnicalSuwako <[email protected]>
  - tgrant <[email protected]>
  - timm2k <[email protected]>
  - tux-rampage <[email protected]>

lib/private/Accounts/AccountManager.php

@@ -736,7 +736,7 @@ private function sanitizePropertyFediverse(IAccountProperty $property): void {
 
 				try {
 					// try the public account lookup API of mastodon
-					$response = $client->get("https://{$instance}/api/v1/accounts/lookup?acct={$username}@{$instance}");
+					$response = $client->get("https://{$instance}/.well-known/webfinger?resource=acct:{$username}@{$instance}");
 					// should be a json response with account information
 					$data = $response->getBody();
 					if (is_resource($data)) {
@@ -745,7 +745,7 @@ private function sanitizePropertyFediverse(IAccountProperty $property): void {
 					$decoded = json_decode($data, true);
 					// ensure the username is the same the user passed
 					// in this case we can assume this is a valid fediverse server and account
-					if (!is_array($decoded) || ($decoded['username'] ?? '') !== $username) {
+					if (!is_array($decoded) || ($decoded['subject'] ?? '') !== "acct:{$username}@{$instance}") {
 						throw new InvalidArgumentException();
 					}
 				} catch (InvalidArgumentException) {

tests/lib/Accounts/AccountManagerTest.php

@@ -839,12 +839,12 @@ public function testSanitizingFediverseServer(string $input, ?string $output, bo
 					->willReturn($serverResponse);
 				$client->expects(self::once())
 					->method('get')
-					->with('https://example.com/api/v1/accounts/lookup?acct=[email protected]')
+					->with('https://example.com/.well-known/webfinger?resource=acct:[email protected]')
 					->willReturn($response);
 			} else {
 				$client->expects(self::once())
 					->method('get')
-					->with('https://example.com/api/v1/accounts/lookup?acct=[email protected]')
+					->with('https://example.com/.well-known/webfinger?resource=acct:[email protected]')
 					->willThrowException(new \Exception('404'));
 			}