fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update SearchApiV2Service, fix hashtag search.

Browse source
This commit is contained in:
Daniel Supernault 2023-03-04 14:36:17 -07:00
parent cd1ef7865c
commit 1992b5bc90
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Services/SearchApiV2Service.php
View file

@ -122,11 +122,15 @@ class SearchApiV2Service
protected function hashtags() protected function hashtags()
{ {
$mastodonMode = self::$mastodonMode; $mastodonMode = self::$mastodonMode;
$q = $this->query->input('q');
$limit = $this->query->input('limit') ?? 20; $limit = $this->query->input('limit') ?? 20;
$offset = $this->query->input('offset') ?? 0; $offset = $this->query->input('offset') ?? 0;
$query = $this->query->input('q') . '%'; $query = Str::startsWith($q, '#') ? substr($q, 1) . '%' : $q . '%';
return Hashtag::where('can_search', true) return Hashtag::where('name', 'like', $query)
->where('name', 'like', $query) ->where(function($q) {
return $q->where('can_search', true)
->orWhereNull('can_search');
})
->offset($offset) ->offset($offset)
->limit($limit) ->limit($limit)
->get() ->get()