Skip to content

Force exclusion on --prefixed beatmap search keywords #12147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nanaya wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −5
Open

Force exclusion on --prefixed beatmap search keywords #12147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions app/Libraries/Search/BeatmapsetSearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,21 @@ public function getQuery()

$query = new BoolQuery();

if (present($this->params->queryString)) {
$terms = explode(' ', $this->params->queryString);
$queryString = $this->params->queryString;
if (present($queryString)) {
// force exclusion even in `or` query
$queryString = preg_replace('/(^|\s)-/u', ' +-', $queryString);
$terms = explode(' ', $queryString);

// the subscoping is not necessary but prevents unintentional accidents when combining other matchers
$query->must(
(new BoolQuery())
// results must contain at least one of the terms and boosted by containing all of them,
// or match the id of the beatmapset.
->shouldMatch(1)
->should(['term' => ['_id' => ['value' => $this->params->queryString, 'boost' => 100]]])
->should(QueryHelper::queryString($this->params->queryString, $partialMatchFields, 'or', 1 / count($terms)))
->should(QueryHelper::queryString($this->params->queryString, [], 'and'))
->should(['term' => ['_id' => ['value' => $queryString, 'boost' => 100]]])
->should(QueryHelper::queryString($queryString, $partialMatchFields, 'or', 1 / count($terms)))
->should(QueryHelper::queryString($queryString, [], 'and'))
);
}

Expand Down