From 379c84b7abb7582d90f8dfae0b97c84ed238b15b Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Fri, 24 Nov 2023 17:06:41 -0500 Subject: [PATCH 1/2] Fix call order of Mastodon Top level search on accounts --- src/Module/Api/Mastodon/Search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php index 75dc05e244..07a0d6074d 100644 --- a/src/Module/Api/Mastodon/Search.php +++ b/src/Module/Api/Mastodon/Search.php @@ -115,7 +115,7 @@ class Search extends BaseApi } $accounts = []; - foreach (Contact::searchByName($q, '', $following ? $uid : 0, false, $limit, $offset) as $contact) { + foreach (Contact::searchByName($q, '', false, $following ? $uid : 0, $limit, $offset) as $contact) { $accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid); } From f3f0859e0b5b2b89cc0016e02bb63228f0a82572 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Fri, 24 Nov 2023 17:19:04 -0500 Subject: [PATCH 2/2] Fix if not allowed blocked servers then `server-blocked` condition is false not true --- src/Model/Contact.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index d2e04c998e..1f9dd9782d 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -3629,7 +3629,7 @@ class Contact ]; if (!$show_blocked) { - $condition['server-blocked'] = true; + $condition['server-blocked'] = false; } if ($uid == 0) {