From f45728982bcb1a1bbf640a0e26e6b2641ee7bc54 Mon Sep 17 00:00:00 2001 From: call-me-matt Date: Sat, 28 Jan 2023 13:15:56 +0100 Subject: prioritize local users in mastodon avatar download, fixes #3210 Signed-off-by: call-me-matt --- lib/Service/Social/MastodonProvider.php | 2 +- tests/unit/Service/Social/MastodonProviderTest.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Service/Social/MastodonProvider.php b/lib/Service/Social/MastodonProvider.php index a5db02a3..6ad3acd7 100644 --- a/lib/Service/Social/MastodonProvider.php +++ b/lib/Service/Social/MastodonProvider.php @@ -106,7 +106,7 @@ class MastodonProvider implements ISocialProvider { try { [$masto_user, $masto_server] = $masto_user_server; # search for user on Mastodon - $search = $masto_server . '/api/v2/search?q=' . $masto_user; + $search = $masto_server . '/api/v2/search?q=' . $masto_user . '@' . parse_url($masto_server)["host"]; $result = $this->httpClient->get($search); $jsonResult = json_decode($result->getBody()); # take first search result diff --git a/tests/unit/Service/Social/MastodonProviderTest.php b/tests/unit/Service/Social/MastodonProviderTest.php index db1d6fc3..26d59caf 100644 --- a/tests/unit/Service/Social/MastodonProviderTest.php +++ b/tests/unit/Service/Social/MastodonProviderTest.php @@ -98,9 +98,9 @@ class MastodonProviderTest extends TestCase { ] ]; $contactWithSocialUrls = [ - "https://cloud1/api/v2/search?q=user1", - "https://cloud2/api/v2/search?q=user2", - "https://cloud3//api/v2/search?q=user3", + "https://cloud1/api/v2/search?q=user1@cloud1", + "https://cloud2/api/v2/search?q=user2@cloud2", + "https://cloud3//api/v2/search?q=user3@cloud3", "https://cloud1/api/v1/accounts/1", "https://cloud2/api/v1/accounts/2", "https://cloud3//api/v1/accounts/3" -- cgit v1.2.3