Merge remote-tracking branch 'upstream/master' into l10n_master

Author: peppy

.env.example

@@ -83,15 +83,16 @@ SLACK_ENDPOINT=https://myconan.net/null/
 # S3_AVATAR_REGION=
 # S3_AVATAR_BUCKET=
 # S3_AVATAR_BASE_URL=
-# AVATAR_CACHE_PURGE_PREFIX=
-# AVATAR_CACHE_PURGE_METHOD=
-# AVATAR_CACHE_PURGE_AUTHORIZATION_KEY=
 # DEFAULT_AVATAR=http://localhost/images/layout/avatar-guest@2x.png
 
+# S3_BEATMAPSET_BUCKET=beatmapsets
+
 # S3_SCREENSHOT_BUCKET=screenshots
 # SCREENSHOTS_SHARED_SECRET=1234567890abcd
 # SCREENSHOTS_LEGACY_ID_CUTOFF=1
 
+# CACHE_PROXY_PURGE_AUTHORIZATION_KEY=
+
 # QUEUE_DRIVER=
 # CAMO_KEY=
 # CAMO_PREFIX=
@@ -229,7 +230,7 @@ CLIENT_CHECK_VERSION=false
 # USER_MAX_FRIENDS=250
 # USER_MAX_FRIENDS_SUPPORTER=500
 # USER_MAX_MULTIPLAYER_DURATION=14
-# USER_MAX_MULTIPLAYER_DURATION_SUPPORTER=63
+# USER_MAX_MULTIPLAYER_DURATION_SUPPORTER=93
 # USER_MAX_PLAYLISTS=1
 # USER_MAX_PLAYLISTS_SUPPORTER=5
 # USER_MAX_ITEMS_IN_PLAYLIST=256

Dockerfile.deployment

@@ -56,6 +56,7 @@ RUN echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
     rpm -i https://rpm.henderkes.com/static-php-1-1.noarch.rpm && \
     microdnf module enable -y php-zts:static-$(cat /.php-version) && \
     microdnf install -y \
+      ffmpeg-free \
       frankenphp \
       libjpeg-turbo-utils \
       nginx \

Dockerfile.development

@@ -10,6 +10,7 @@ RUN echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
     microdnf install -y \
       chromedriver \
       chromium \
+      ffmpeg-free \
       frankenphp \
       git \
       libjpeg-turbo-utils \

app/Exceptions/CacheProxyPurgeException.php

@@ -0,0 +1,12 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+class CacheProxyPurgeException extends \Exception
+{
+}

app/Http/Controllers/ContestEntriesController.php

@@ -43,7 +43,7 @@ public function judgeResults($contestId, $id)
             $includes[] = 'judge_votes.user';
         }
 
-        $entries = $contest->entriesByType(null)->loadMissing($relationships);
+        $entries = $contest->entriesWithScore()->loadMissing($relationships);
         foreach ($entries as $entry) {
             $entry->setRelation('contest', $contest);
         }

app/Http/Controllers/ContestsController.php

@@ -27,15 +27,18 @@ public function index()
 
     public function judge($id)
     {
-        $contest = Contest::with('entries.judgeVotes')
-            ->with('entries.judgeVotes.scores')
+        $contest = Contest::with('entries.judgeVotes.scores')
             ->with('scoringCategories')
             ->findOrFail($id);
 
         abort_if(!$contest->isJudged(), 404);
 
         priv_check('ContestJudgeShow', $contest)->ensureCan();
 
+        foreach ($contest->entries as $entry) {
+            $entry->setRelation('contest', $contest);
+        }
+
         $contestJson = json_item($contest, new ContestTransformer(), [
             'current_user_attributes',
             'entries.current_user_judge_vote.scores',

app/Http/Controllers/LegacyInterOpController.php

@@ -8,7 +8,7 @@
 use App\Exceptions\Handler as ExceptionHandler;
 use App\Jobs\EsDocument;
 use App\Jobs\Notifications\ForumTopicReply;
-use App\Jobs\RegenerateBeatmapsetCover;
+use App\Jobs\RegenerateBeatmapsetMedia;
 use App\Libraries\Chat;
 use App\Models\Beatmap;
 use App\Models\Beatmapset;
@@ -58,7 +58,7 @@ public function indexBeatmapset($id)
         $beatmapset = Beatmapset::withTrashed()->findOrFail($id);
 
         if (!$beatmapset->trashed()) {
-            $job = (new RegenerateBeatmapsetCover($beatmapset))->onQueue('beatmap_default');
+            $job = (new RegenerateBeatmapsetMedia($beatmapset))->onQueue('beatmap_default');
             $this->dispatch($job);
         }
 

app/Http/Controllers/TagsController.php

@@ -18,6 +18,8 @@ public function __construct()
 
     public function index()
     {
+        priv_check('BeatmapsetAdvancedSearch')->ensureCan();
+
         return [
             'tags' => app('tags')->json(),
         ];

app/Libraries/Commentable.php app/Interfaces/CommentableInterface.phpapp/Libraries/Commentable.php renamed to app/Interfaces/CommentableInterface.php

@@ -3,9 +3,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace App\Libraries;
+namespace App\Interfaces;
 
-interface Commentable
+interface CommentableInterface
 {
     public function commentLocked(): bool;
 

app/Jobs/RegenerateBeatmapsetMedia.php

@@ -0,0 +1,64 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Jobs;
+
+use App\Exceptions\BeatmapProcessorException;
+use App\Exceptions\SilencedException;
+use App\Models\Beatmapset;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class RegenerateBeatmapsetMedia implements ShouldQueue
+{
+    use InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * The number of seconds the job can run before timing out.
+     *
+     * @var int
+     */
+    public $timeout = 300;
+
+    public function __construct(protected Beatmapset $beatmapset)
+    {
+    }
+
+    public function displayName()
+    {
+        return static::class." (Beatmapset {$this->beatmapset->getKey()})";
+    }
+
+    public function handle()
+    {
+        $this->runTask(
+            'regenerate_beatmapset_cover',
+            fn () => $this->beatmapset->regenerateCovers(),
+        );
+        $this->runTask(
+            'regenerate_beatmapset_preview',
+            fn () => $this->beatmapset->regenerateAudioPreview(),
+        );
+    }
+
+    private function runTask(string $task, callable $taskFn): void
+    {
+        try {
+            $taskFn();
+            datadog_increment("{$task}.ok");
+        } catch (\Throwable $e) {
+            datadog_increment("{$task}.error");
+            log_error(new BeatmapProcessorException(previous: $e), [
+                'task' => $task,
+                'id' => $this->beatmapset->getKey(),
+            ]);
+            throw new SilencedException(previous: $e);
+        }
+    }
+}