Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-12 06:24:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

API: Reworked request parameter handling

Browse source
This commit is contained in:
Michael 2021-05-18 19:26:46 +00:00
parent dbd349b92e
commit e5c1b90668
16 changed files with 233 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,34 +43,32 @@ class Search extends BaseApi
self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID();
// What to search for
$q = $_REQUEST['q'] ?? '';
// Maximum number of results. Defaults to 40.
$limit = (int)($_REQUEST['limit'] ?? 40);
// Attempt WebFinger lookup. Defaults to false. Use this when q is an exact address.
$resolve = ($_REQUEST['resolve'] ?? '') == 'true';
// Only who the user is following. Defaults to false.
$following = ($_REQUEST['following'] ?? '') == 'true';
$request = self::getRequest([
'q' => '', // What to search for
'limit' => 40, // Maximum number of results. Defaults to 40.
'resolve' => false, // Attempt WebFinger lookup. Defaults to false. Use this when q is an exact address.
'following' => false, // Only who the user is following. Defaults to false.
]);
$accounts = [];
if (!$following) {
if ((strrpos($q, '@') > 0) && $resolve) {
$results = CoreSearch::getContactsFromProbe($q);
if (!$request['following']) {
if ((strrpos($request['q'], '@') > 0) && $request['resolve']) {
$results = CoreSearch::getContactsFromProbe($request['q']);
}
if (empty($results)) {
if (DI::config()->get('system', 'poco_local_search')) {
$results = CoreSearch::getContactsFromLocalDirectory($q, CoreSearch::TYPE_ALL, 0, $limit);
$results = CoreSearch::getContactsFromLocalDirectory($request['q'], CoreSearch::TYPE_ALL, 0, $request['limit']);
} elseif (!empty(DI::config()->get('system', 'directory'))) {
$results = CoreSearch::getContactsFromGlobalDirectory($q, CoreSearch::TYPE_ALL, 1);
$results = CoreSearch::getContactsFromGlobalDirectory($request['q'], CoreSearch::TYPE_ALL, 1);
}
}
if (!empty($results)) {
$counter = 0;
foreach ($results->getResults() as $result) {
if (++$counter > $limit) {
if (++$counter > $request['limit']) {
continue;
}
if ($result instanceof ContactResult) {
@ -81,14 +79,14 @@ class Search extends BaseApi
}
}
} else {
$contacts = Contact::searchByName($q, '', $uid);
$contacts = Contact::searchByName($request['q'], '', $uid);
$counter = 0;
foreach ($contacts as $contact) {
if (!in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND])) {
continue;
}
if (++$counter > $limit) {
if (++$counter > $request['limit']) {
continue;
}
$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);