Merge pull request #11987 from nanaya/remove-unused-beatmap-blocklist

Remove unused beatmap search blocklist

Author: notbakaneko

.github/workflows/tests.yml

@@ -152,7 +152,6 @@ jobs:
 
       - name: Setup indices
         run: |
-          php artisan es:create-search-blacklist
           php artisan es:index-documents --no-interaction
           php artisan es:index-wiki --create-only --no-interaction
 

app/Console/Commands/EsCreateSearchBlacklist.php

@@ -57,8 +57,6 @@ public function handle()
             '--no-interaction' => $this->option('no-interaction'),
         ]);
 
-        $this->call('es:create-search-blacklist');
-
         if ($this->needsSeeding()) {
             $this->runSeeder(null);
         }

app/Console/Commands/MigrateFreshAllCommand.php

@@ -63,7 +63,6 @@ public function getQuery()
             );
         }
 
-        $this->addBlacklistFilter($query);
         $this->addBlockedUsersFilter($query);
         $this->addFeaturedArtistFilter($query);
         $this->addFeaturedArtistsFilter($query);
@@ -122,29 +121,6 @@ public function records()
             }])->get();
     }
 
-    private function addBlacklistFilter($query)
-    {
-        static $fields = ['artist', 'source', 'tags'];
-        $params = [
-            'index' => $GLOBALS['cfg']['osu']['elasticsearch']['prefix'].'blacklist',
-            'id' => 'beatmapsets',
-            // can be changed to per-field blacklist as different fields should probably have different restrictions.
-            'path' => 'keywords',
-        ];
-
-        $bool = new BoolQuery();
-
-        foreach ($fields as $field) {
-            $bool->mustNot([
-                'terms' => [
-                    $field => $params,
-                ],
-            ]);
-        }
-
-        $query->filter($bool);
-    }
-
     private function addBlockedUsersFilter($query)
     {
         $query->mustNot(['terms' => ['user_id' => $this->params->blockedUserIds()]]);