eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[COMPONENT][Search] Fix search

Browse Source
This commit is contained in:
Hugo Sales
2021-12-07 20:25:28 +00:00
parent c131e47176
commit f9fedfb131
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/Tag/Tag.php
View File

@@ -150,21 +150,20 @@ class Tag extends Component
*
* $term /^(note|tag|people|actor)/ means we want to match only either a note or an actor
*/
public function onSearchCreateExpression(ExpressionBuilder $eb, string $term, &$note_expr, &$actor_expr): bool
public function onSearchCreateExpression(ExpressionBuilder $eb, string $term, ?string $language, &$note_expr, &$actor_expr): bool
{
$search_term = str_contains($term, ':#') ? explode(':', $term)[1] : $term;
$temp_note_expr = $eb->eq('note_tag.tag', $search_term);
$temp_actor_expr = $eb->eq('actor_tag.tag', $search_term);
$search_term = str_contains($term, ':#') ? explode(':', $term)[1] : $term;
$canon_search_term = self::canonicalTag($search_term, $language);
$temp_note_expr = $eb->eq('note_tag.canonical', $canon_search_term);
$temp_actor_expr = $eb->eq('actor_tag.canonical', $canon_search_term);
if (Formatting::startsWith($term, ['note', 'tag'])) {
$note_expr = $temp_note_expr;
} elseif (Formatting::startsWith($term, ['people', 'actor'])) {
$actor_expr = $temp_actor_expr;
} else {
if (Formatting::startsWith($term, ['people', 'actor'])) {
$actor_expr = $temp_actor_expr;
} else {
$note_expr = $temp_note_expr;
$actor_expr = $temp_actor_expr;
return Event::next;
}
$note_expr = $temp_note_expr;
$actor_expr = $temp_actor_expr;
return Event::next;
}
return Event::stop;
}