Fix beatmap search simple keyword exclusion still being included

Author: nanaya

app/Libraries/Search/BeatmapsetSearch.php

@@ -45,6 +45,7 @@ public function getQuery()
             'title_unicode',
             'title_unicode.*',
             'tags^0.5',
+            'user_tags',
         ];
 
         $query = new BoolQuery();
@@ -61,12 +62,6 @@ public function getQuery()
                     ->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([
-                        'nested' => [
-                            'path' => 'beatmaps',
-                            'query' => QueryHelper::queryString($this->params->queryString, ['beatmaps.top_tags'], 'or', 0.5 / count($terms)),
-                        ],
-                    ])
             );
         }
 

app/Models/Traits/Es/BeatmapsetSearch.php

@@ -7,6 +7,7 @@
 
 use App\Models\Beatmap;
 use Carbon\Carbon;
+use Ds\Set;
 
 trait BeatmapsetSearch
 {
@@ -68,8 +69,14 @@ private function esBeatmapsetValues()
                 continue;
             }
 
+            $userTags = new Set();
+            foreach ($this->beatmaps as $beatmap) {
+                $userTags->add(...$this->esBeatmapTags($beatmap));
+            }
+
             $value = match ($field) {
                 'id' => $this->getKey(),
+                'user_tags' => $userTags,
                 default => $this->$field,
             };
 

config/schemas/beatmapsets.json

@@ -243,6 +243,9 @@
       "user_id": {
         "type": "long"
       },
+      "user_tags": {
+        "type": "text"
+      },
       "video": {
         "type": "boolean"
       }