chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Fix SearchApiV2Service, improve webfinger condition

Browse source
This commit is contained in:
Daniel Supernault 2022-08-31 21:37:43 -06:00
parent 6d6a033a54
commit 9d31f73bfa
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Services/SearchApiV2Service.php
View file

@ -33,7 +33,6 @@ class SearchApiV2Service
$q = urldecode($query->input('q')); $q = urldecode($query->input('q'));
if($query->has('resolve') && if($query->has('resolve') &&
$query->resolve == true &&
( Str::startsWith($q, 'https://') || ( Str::startsWith($q, 'https://') ||
Str::substrCount($q, '@') >= 1) Str::substrCount($q, '@') >= 1)
) { ) {
@ -203,7 +202,7 @@ class SearchApiV2Service
return $default; return $default;
} }
if(Str::substrCount($query, '@') == 1 && strpos($query, '@') !== 0) { if(!Str::startsWith($query, 'http') && Str::substrCount($query, '@') == 1 && strpos($query, '@') !== 0) {
try { try {
$res = WebfingerService::lookup('@' . $query, $mastodonMode); $res = WebfingerService::lookup('@' . $query, $mastodonMode);
} catch (\Exception $e) { } catch (\Exception $e) {

3
app/Services/WebfingerService.php
View file

@ -56,6 +56,9 @@ class WebfingerService
->first(); ->first();
$profile = Helpers::profileFetch($link); $profile = Helpers::profileFetch($link);
if(!$profile) {
return;
}
return $mastodonMode ? return $mastodonMode ?
AccountService::getMastodon($profile->id, true) : AccountService::getMastodon($profile->id, true) :
AccountService::get($profile->id); AccountService::get($profile->id);