clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13666 from HankG/mastodon-api-account-search-fixes 

Mastodon api account search fixes
This commit is contained in:
Hypolite Petovan 2023-11-24 21:18:51 -05:00 committed by GitHub
parent ce5aa016e1 f3f0859e0b
commit a569068fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Contact.php
View File

@ -3629,7 +3629,7 @@ class Contact
]; ];
if (!$show_blocked) { if (!$show_blocked) {
$condition['server-blocked'] = true; $condition['server-blocked'] = false;
} }
if ($uid == 0) { if ($uid == 0) {

2
src/Module/Api/Mastodon/Search.php
View File

@ -115,7 +115,7 @@ class Search extends BaseApi
} }
$accounts = []; $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); $accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
} }