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

Merge pull request #12348 from annando/api-search-offset 

API: Only search for direct hit without offset
This commit is contained in:
Tobias Diekershoff 2022-12-06 21:05:32 +01:00 committed by GitHub
parent 215c332a94 6965614f00
commit 05f8303034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Module/Api/Mastodon/Accounts/Search.php
View File

@ -29,7 +29,7 @@ use Friendica\Module\BaseApi;
use Friendica\Util\Network; use Friendica\Util\Network;
/** /**
* @see https://docs.joinmastodon.org/methods/accounts/ * @see https://docs.joinmastodon.org/methods/accounts/#search
*/ */
class Search extends BaseApi class Search extends BaseApi
{ {
@ -44,13 +44,14 @@ class Search extends BaseApi
$request = $this->getRequest([ $request = $this->getRequest([
'q' => '', // What to search for 'q' => '', // What to search for
'limit' => 40, // Maximum number of results. Defaults to 40. 'limit' => 40, // Maximum number of results. Defaults to 40.
'offset' => 0, // Offset in search results. Used for pagination. Defaults to 0.
'resolve' => false, // Attempt WebFinger lookup. Defaults to false. Use this when q is an exact address. '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. 'following' => false, // Only who the user is following. Defaults to false.
], $request); ], $request);
$accounts = []; $accounts = [];
if ((strrpos($request['q'], '@') > 0) || Network::isValidHttpUrl($request['q'])) { if (($request['offset'] == 0) && (Network::isValidHttpUrl($request['q']) || (strrpos($request['q'], '@') > 0))) {
$id = Contact::getIdForURL($request['q'], 0, $request['resolve'] ? null : false); $id = Contact::getIdForURL($request['q'], 0, $request['resolve'] ? null : false);
if (!empty($id)) { if (!empty($id)) {
@ -59,7 +60,7 @@ class Search extends BaseApi
} }
if (empty($accounts)) { if (empty($accounts)) {
$contacts = Contact::searchByName($request['q'], '', $request['following'] ? $uid : 0, $request['limit']); $contacts = Contact::searchByName($request['q'], '', $request['following'] ? $uid : 0, $request['limit'], $request['offset']);
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid); $accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
} }

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

@ -108,7 +108,7 @@ class Search extends BaseApi
private static function searchAccounts(int $uid, string $q, bool $resolve, int $limit, int $offset, bool $following) private static function searchAccounts(int $uid, string $q, bool $resolve, int $limit, int $offset, bool $following)
{ {
if ( if (
(strrpos($q, '@') > 0 || Network::isValidHttpUrl($q)) ($offset == 0) && (strrpos($q, '@') > 0 || Network::isValidHttpUrl($q))
&& $id = Contact::getIdForURL($q, 0, $resolve ? null : false) && $id = Contact::getIdForURL($q, 0, $resolve ? null : false)
) { ) {
return DI::mstdnAccount()->createFromContactId($id, $uid); return DI::mstdnAccount()->createFromContactId($id, $uid);