Merge remote-tracking branch 'origin/master' into HEAD

Author: nanaya

.env.example

@@ -290,8 +290,6 @@ CLIENT_CHECK_VERSION=false
 # TWITCH_CLIENT_SECRET=
 
 # SCORES_ES_CACHE_DURATION=
-# SCORES_EXPERIMENTAL_RANK_AS_DEFAULT=false
-# SCORES_EXPERIMENTAL_RANK_AS_EXTRA=false
 # SCORES_PROCESSING_QUEUE=osu-queue:score-statistics
 # SCORES_SUBMISSION_ENABLED=1
 # SCORE_INDEX_MAX_ID_DISTANCE=10_000_000
@@ -304,7 +302,6 @@ CLIENT_CHECK_VERSION=false
 # TRUSTED_PROXIES=
 
 # IS_DEVELOPMENT_DEPLOY=true
-# OSU_EXPERIMENTAL_HOST=
 
 # OSU_URL_LAZER_ANDROID='https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk'
 # OSU_URL_LAZER_IOS='/home/testflight'
@@ -329,3 +326,6 @@ CLIENT_CHECK_VERSION=false
 
 # TAGS_CACHE_DURATION=60
 # BEATMAP_TAGS_CACHE_DURATION=60
+
+# OSU_SENTRY_MIN_LOG_DURATION_MS=500
+# SENTRY_TRACES_SAMPLE_RATE=

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           tools: composer:v2, cs2pr
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: none
 
       - name: Get composer cache directory

.github/workflows/tests.yml

@@ -95,7 +95,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        php: ['8.3']
+        php: ['8.4']
     name: Tests
     runs-on: ubuntu-latest
     steps:
@@ -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
 

Dockerfile.deployment

@@ -14,20 +14,20 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
     build-essential \
     git \
     nodejs \
-    php8.3 \
-    php8.3-common \
-    php8.3-curl \
-    php8.3-ds \
-    php8.3-gd \
-    php8.3-intl \
-    php8.3-mbstring \
-    php8.3-mysql \
-    php8.3-redis \
-    php8.3-sqlite3 \
-    php8.3-swoole \
-    php8.3-tokenizer \
-    php8.3-xml \
-    php8.3-zip \
+    php8.4 \
+    php8.4-common \
+    php8.4-curl \
+    php8.4-ds \
+    php8.4-gd \
+    php8.4-intl \
+    php8.4-mbstring \
+    php8.4-mysql \
+    php8.4-redis \
+    php8.4-sqlite3 \
+    php8.4-swoole \
+    php8.4-tokenizer \
+    php8.4-xml \
+    php8.4-zip \
     zip
 
 RUN npm install -g yarn
@@ -55,20 +55,20 @@ RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
     jhead \
     nginx \
-    php8.3 \
-    php8.3-common \
-    php8.3-curl \
-    php8.3-ds \
-    php8.3-gd \
-    php8.3-intl \
-    php8.3-mbstring \
-    php8.3-mysql \
-    php8.3-redis \
-    php8.3-sqlite3 \
-    php8.3-swoole \
-    php8.3-tokenizer \
-    php8.3-xml \
-    php8.3-zip
+    php8.4 \
+    php8.4-common \
+    php8.4-curl \
+    php8.4-ds \
+    php8.4-gd \
+    php8.4-intl \
+    php8.4-mbstring \
+    php8.4-mysql \
+    php8.4-redis \
+    php8.4-sqlite3 \
+    php8.4-swoole \
+    php8.4-tokenizer \
+    php8.4-xml \
+    php8.4-zip
 
 RUN rm -f /var/log/nginx/access.log /var/log/nginx/error.log && \
     ln -s /dev/stdout /var/log/nginx/access.log && \

Dockerfile.development

@@ -12,26 +12,27 @@ RUN echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesou
 RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
     build-essential \
+    chromium \
     chromium-driver \
     default-mysql-client \
     git \
     gosu \
     jhead \
     nodejs \
-    php8.3 \
-    php8.3-common \
-    php8.3-curl \
-    php8.3-ds \
-    php8.3-gd \
-    php8.3-intl \
-    php8.3-mbstring \
-    php8.3-mysql \
-    php8.3-redis \
-    php8.3-sqlite3 \
-    php8.3-swoole \
-    php8.3-tokenizer \
-    php8.3-xml \
-    php8.3-zip \
+    php8.4 \
+    php8.4-common \
+    php8.4-curl \
+    php8.4-ds \
+    php8.4-gd \
+    php8.4-intl \
+    php8.4-mbstring \
+    php8.4-mysql \
+    php8.4-redis \
+    php8.4-sqlite3 \
+    php8.4-swoole \
+    php8.4-tokenizer \
+    php8.4-xml \
+    php8.4-zip \
     zip
 
 RUN npm install -g yarn

README.md

@@ -9,7 +9,7 @@ The browser-facing portion of [osu!](https://osu.ppy.sh/home).
 
 ## Requirements
 
-- A PHP 8.3 environment
+- A PHP 8.4 environment
 - MySQL 8.0+
 - Elasticsearch
 

app/Console/Commands/EsCreateSearchBlacklist.php

@@ -104,20 +104,21 @@ private function indexGroup($name)
 
         foreach ($types as $type) {
             $bar = $this->output->createProgressBar();
+            $bar->setFormat(' %current% [%bar%] %message%');
 
             $this->info("{$pretext} {$type} into {$indexName}");
 
+            $progressCallback = function ($progress, $message) use ($bar) {
+                $bar->setMessage($message);
+                $bar->setProgress($progress);
+            };
             if (!$this->inplace && $type === $first) {
                 // create new index if the first type for this index, otherwise
                 // index in place.
-                $type::esIndexIntoNew(Es::CHUNK_SIZE, $indexName, function ($progress) use ($bar) {
-                    $bar->setProgress($progress);
-                });
+                $type::esIndexIntoNew(Es::CHUNK_SIZE, $indexName, $progressCallback);
             } else {
                 $options = ['index' => $indexName];
-                $type::esReindexAll(Es::CHUNK_SIZE, 0, $options, function ($progress) use ($bar) {
-                    $bar->setProgress($progress);
-                });
+                $type::esReindexAll(Es::CHUNK_SIZE, 0, $options, $progressCallback);
             }
 
             $bar->finish();

app/Console/Commands/EsIndexDocuments.php

@@ -136,10 +136,13 @@ private function reindex()
         $total = count($paths);
         $this->line("Total: {$total} documents");
         $bar = $this->output->createProgressBar($total);
+        $bar->setFormat(' %current% [%bar%] %message%');
+        $logger = fn ($message) => $bar->setMessage($message);
 
         foreach ($paths as $path => $_inEs) {
             $pagePath = Page::parsePagePath($path);
             $page = new Page($pagePath['path'], $pagePath['locale']);
+            $page->logger = $logger;
             $page->sync(true, $this->indexName);
 
             if (!$page->isVisible()) {

app/Console/Commands/EsIndexWiki.php

@@ -6,8 +6,10 @@
 namespace App\Console\Commands;
 
 use Illuminate\Database\Console\Migrations\FreshCommand;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
 
+#[AsCommand(name: 'migrate:fresh')]
 class MigrateFreshAllCommand extends FreshCommand
 {
     public function handle()
@@ -57,8 +59,6 @@ public function handle()
             '--no-interaction' => $this->option('no-interaction'),
         ]);
 
-        $this->call('es:create-search-blacklist');
-
         if ($this->needsSeeding()) {
             $this->runSeeder(null);
         }