Reorder search to try redirecting to post first
- Pleroma's post page includes the author's feed which wrongly gets picked up as a contact - Address https://libranet.de/display/0b6b25a8-1563-7ec0-7408-70b986546395
This commit is contained in:
parent
849ce8f203
commit
9de6350154
|
@ -120,27 +120,27 @@ class Index extends BaseSearch
|
||||||
if (strpos($search, '#') === 0) {
|
if (strpos($search, '#') === 0) {
|
||||||
$tag = true;
|
$tag = true;
|
||||||
$search = substr($search, 1);
|
$search = substr($search, 1);
|
||||||
}
|
} else {
|
||||||
|
if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
|
||||||
|
return self::performContactSearch($search);
|
||||||
|
}
|
||||||
|
|
||||||
self::tryRedirectToProfile($search);
|
self::tryRedirectToPost($search);
|
||||||
|
|
||||||
if (strpos($search, '@') === 0 || strpos($search, '!') === 0) {
|
self::tryRedirectToProfile($search);
|
||||||
return self::performContactSearch($search);
|
|
||||||
}
|
|
||||||
|
|
||||||
self::tryRedirectToPost($search);
|
if (!empty($_GET['search-option'])) {
|
||||||
|
switch ($_GET['search-option']) {
|
||||||
if (!empty($_GET['search-option'])) {
|
case 'fulltext':
|
||||||
switch ($_GET['search-option']) {
|
break;
|
||||||
case 'fulltext':
|
case 'tags':
|
||||||
break;
|
$tag = true;
|
||||||
case 'tags':
|
break;
|
||||||
$tag = true;
|
case 'contacts':
|
||||||
break;
|
return self::performContactSearch($search, '@');
|
||||||
case 'contacts':
|
case 'forums':
|
||||||
return self::performContactSearch($search, '@');
|
return self::performContactSearch($search, '!');
|
||||||
case 'forums':
|
}
|
||||||
return self::performContactSearch($search, '!');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue