Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 06:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12956 from annando/server-blocked

Browse source 
Don't search for contacts on blocked or failed systems
This commit is contained in:
Hypolite Petovan 2023-03-29 14:58:12 -04:00 • committed by GitHub
commit bc7bf77096
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 53 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Mastodon/Accounts/Search.php
View file

@ -60,7 +60,7 @@ class Search extends BaseApi
}
if (empty($accounts)) {
$contacts = Contact::searchByName($request['q'], '', $request['following'] ? $uid : 0, $request['limit'], $request['offset']);
$contacts = Contact::searchByName($request['q'], '', false, $request['following'] ? $uid : 0, $request['limit'], $request['offset']);
foreach ($contacts as $contact) {
$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
}

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

@ -115,7 +115,7 @@ class Search extends BaseApi
}
$accounts = [];
foreach (Contact::searchByName($q, '', $following ? $uid : 0, $limit, $offset) as $contact) {
foreach (Contact::searchByName($q, '', $following ? $uid : 0, false, $limit, $offset) as $contact) {
$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
}