Merge branch 'master' into ranking-global

Author: notbakaneko

.github/workflows/tests.yml

@@ -102,6 +102,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      # otherwise docker compose will create .env directory
+      - name: Create blank env file
+        run: '> .env'
+
       - name: Services
         run: 'docker compose up --quiet-pull --wait
           beatmap-difficulty-lookup-cache

app/Exceptions/ChangeUsernameException.php

@@ -12,7 +12,7 @@ class ChangeUsernameException extends Exception
 {
     private $errors;
 
-    public function __construct($errors, Exception $previous = null)
+    public function __construct($errors, ?Exception $previous = null)
     {
         if ($errors instanceof ValidationErrors) {
             $message = $errors->toSentence();

app/Exceptions/ValidationException.php

@@ -12,7 +12,7 @@ class ValidationException extends Exception
 {
     private $errors;
 
-    public function __construct(ValidationErrors $errors = null, Exception $previous = null)
+    public function __construct(?ValidationErrors $errors = null, ?Exception $previous = null)
     {
         $message = null;
         if ($errors !== null) {

app/Http/Controllers/BeatmapDiscussionsController.php

@@ -134,7 +134,7 @@ public function review($beatmapsetId)
         priv_check('BeatmapsetDiscussionReviewStore', $beatmapset)->ensureCan();
 
         try {
-            $document = json_decode(request()->all()['document'] ?? '[]', true);
+            $document = get_arr(json_decode(get_string(request('document')) ?? '[]', true)) ?? [];
             Review::create($beatmapset, $document, Auth::user());
         } catch (\Exception $e) {
             return error_popup($e->getMessage(), 422);

app/Http/Controllers/BeatmapsController.php

@@ -44,6 +44,7 @@ private static function assertSupporterOnlyOptions(?User $currentUser, string $t
         }
     }
 
+    // TODO: move this to scores() and remove soloScores(). Probably sometime after October 2025.
     private static function beatmapScores(string $id, ?string $scoreTransformerType, ?bool $isLegacy): array
     {
         $beatmap = Beatmap::findOrFail($id);
@@ -369,6 +370,8 @@ public function scores($id)
      *
      * Returns the top scores for a beatmap.
      *
+     * This endpoint is deprecated. Use [Get Beatmap scores](#get-beatmap-scores) with appropriate api version header instead.
+     *
      * ---
      *
      * ### Response Format

app/Http/Controllers/BeatmapsetsController.php

@@ -407,16 +407,17 @@ private function showJson($beatmapset)
         $transformer = new BeatmapsetTransformer();
         $transformer->relatedUsersType = 'show';
 
+        static $sharedIncludes = [
+            'failtimes',
+            'owners',
+            'top_tag_ids',
+        ];
+
         return json_item($beatmapset, $transformer, [
-            'beatmaps',
-            'beatmaps.failtimes',
-            'beatmaps.max_combo',
-            'beatmaps.owners',
+            ...array_map(fn ($include) => "beatmaps.{$include}", $sharedIncludes),
             'beatmaps.current_user_tag_ids',
-            'beatmaps.top_tag_ids',
-            'converts',
-            'converts.failtimes',
-            'converts.owners',
+            'beatmaps.max_combo',
+            ...array_map(fn ($include) => "converts.{$include}", $sharedIncludes),
             'current_nominations',
             'current_user_attributes',
             'description',

app/Http/Controllers/Multiplayer/RoomsController.php

@@ -49,15 +49,8 @@ public function index()
         $includes = ['host.country', 'playlist.beatmap'];
 
         $search = Room::search($params);
-        $query = $search['query'];
 
-        // temporary workaround for lazer client failing to deserialise `daily_challenge` room category
-        // can be removed 20241129
-        if ($apiVersion < 20240529) {
-            $query->whereNot('category', 'daily_challenge');
-        }
-
-        $rooms = $query
+        $rooms = $search['query']
             ->with($includes)
             ->withRecentParticipantIds()
             ->get();

app/Http/Controllers/UsersController.php

@@ -532,7 +532,7 @@ public function scores($_userId, $type)
 
         $perPage = $this->perPage;
 
-        if ($type === 'firsts' || $type === 'pinned') {
+        if (in_array($type, ['best', 'firsts', 'pinned'], true)) {
             // Override per page restriction in parsePaginationParams to allow infinite paging
             $perPage = $this->sanitizedLimitParam();
         }

app/Jobs/RegenerateBeatmapsetCover.php

@@ -35,7 +35,7 @@ class RegenerateBeatmapsetCover implements ShouldQueue
      *
      * @return void
      */
-    public function __construct(Beatmapset $beatmapset, array $sizesToRegenerate = null)
+    public function __construct(Beatmapset $beatmapset, ?array $sizesToRegenerate = null)
     {
         $this->beatmapset = $beatmapset;
         $this->sizesToRegenerate = $sizesToRegenerate;

app/Libraries/BeatmapsetDiscussion/Review.php

@@ -89,7 +89,7 @@ public static function update(BeatmapDiscussion $discussion, array $document, Us
         return (new static($beatmapset, $user, $document, $discussion))->process();
     }
 
-    private function createDiscussion(string $discussionType, string $message, int $beatmapId = null, string $timestamp = null)
+    private function createDiscussion(string $discussionType, string $message, ?int $beatmapId = null, ?string $timestamp = null)
     {
         $userId = $this->user->getKey();