Merge pull request #12047 from notbakaneko/feature/tag-search-quote

Use fully quoted tags for Beatmapset user tag links

Author: nanaya

app/Libraries/Search/BeatmapsetSearch.php

@@ -408,20 +408,29 @@ private function addTextFilter(BoolQuery $query, string $paramField, array $fiel
 
     private function addTagsFilter(BoolQuery $query): void
     {
-        if ($this->params->tags === null) {
+        $tags = $this->params->tags;
+        if ($tags === null) {
             return;
         }
 
-        $tagSet = new Set(array_map('mb_strtolower', $this->params->tags));
-        $tags = Tag::whereIn('name', $this->params->tags)->limit(10)->pluck('name');
-        $tagSet->remove(...$tags->map(fn ($name) => mb_strtolower($name))->toArray());
+        // workaround multi tag parsing when there's an empty tag.
+        $tags = array_reject_null($tags);
 
-        foreach ($tagSet as $tag) {
-            $query->filter(QueryHelper::queryString($tag, ['beatmaps.top_tags'], 'and'));
+        $tagMap = [];
+        foreach ($tags as $tag) {
+            $key = mb_strtolower(mb_trim($tag, '"'));
+            $tagMap[$key] = $tag;
         }
 
-        foreach ($tags as $tag) {
+        $exactTags = Tag::whereIn('name', array_keys($tagMap))->limit(10)->pluck('name');
+
+        foreach ($exactTags as $tag) {
             $query->filter(['term' => ['beatmaps.top_tags.raw' => $tag]]);
+            unset($tagMap[mb_strtolower($tag)]);
+        }
+
+        foreach (array_values($tagMap) as $tag) {
+            $query->filter(QueryHelper::queryString($tag, ['beatmaps.top_tags'], 'and'));
         }
     }
 

resources/js/beatmapsets-show/info.tsx

@@ -194,11 +194,11 @@ export default class Info extends React.Component<Props> {
                 {trans('beatmapsets.show.info.user_tags')}
               </h3>
               <div className='beatmapset-info__value-overflow'>
-                {this.controller.tags.userTags.map((tag, i) => (
-                  <React.Fragment key={`${tag.name}-${i}`}>
+                {this.controller.tags.userTags.map((tag) => (
+                  <React.Fragment key={tag.name}>
                     <a
                       className='beatmapset-info__link'
-                      href={route('beatmapsets.index', { q: tag.name })}
+                      href={route('beatmapsets.index', { q: makeSearchQueryOption('tag', tag.name) })}
                     >
                       {tag.name}
                     </a>

resources/js/contest-judge-results/header.tsx

@@ -41,13 +41,13 @@ export default class Header extends React.PureComponent<Props> {
         <div className='contest-judge-results-header__values'>
           <ValueDisplay
             label={trans('contest.judge_results.total_score')}
-            modifiers={'judge-results'}
+            modifiers='judge-results'
             value={totalScore}
           />
 
           <ValueDisplay
             label={trans('contest.judge_results.creator')}
-            modifiers={'judge-results'}
+            modifiers='judge-results'
             value={
               <UserLink user={this.props.entry.user} />
             }

resources/lang/en/beatmapsets.php

@@ -140,6 +140,7 @@
             'description' => 'Description',
             'genre' => 'Genre',
             'language' => 'Language',
+            'mapper_tags' => 'Mapper Tags',
             'no_scores' => 'Data still being calculated...',
             'nominators' => 'Nominators',
             'nsfw' => 'Explicit content',
@@ -148,9 +149,8 @@
             'source' => 'Source',
             'storyboard' => 'This beatmap contains storyboard',
             'success-rate' => 'Success Rate',
-            'video' => 'This beatmap contains video',
             'user_tags' => 'User Tags',
-            'mapper_tags' => 'Mapper Tags',
+            'video' => 'This beatmap contains video',
         ],
 
         'nsfw_warning' => [