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

Merge pull request #12801 from HankG/fix-mastodon-api-search

Browse source 
Fix mastodon api search
This commit is contained in:
Michael Vogel 2023-02-17 18:56:08 +01:00 committed by GitHub
commit 659fab0fe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@ class Search extends BaseApi
} }
} }
if ((empty($request['type']) || ($request['type'] == 'statuses')) && (strpos($request['q'], '@') == false)) { if (empty($request['type']) || ($request['type'] == 'statuses')) {
$result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']); $result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']);
if (!is_array($result['statuses'])) { if (!is_array($result['statuses'])) {
@ -108,8 +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 (($offset == 0) && (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);