Simplify score transformer variation parameter

Author: nanaya

app/Http/Controllers/BeatmapsController.php

@@ -45,7 +45,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
+    private static function beatmapScores(string $id, ?bool $legacyFormat, ?bool $isLegacy): array
     {
         $beatmap = Beatmap::findOrFail($id);
         if ($beatmap->approved <= 0) {
@@ -77,7 +77,7 @@ private static function beatmapScores(string $id, ?string $scoreTransformerType,
         ]);
         $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country', 'user.team', 'processHistory']);
         $userScore = $esFetch->userBest();
-        $scoreTransformer = new ScoreTransformer($scoreTransformerType);
+        $scoreTransformer = new ScoreTransformer($legacyFormat);
 
         $results = [
             'score_count' => UserRank::getCount($esFetch->baseParams),
@@ -386,7 +386,7 @@ public function scores($id)
      */
     public function soloScores($id)
     {
-        return static::beatmapScores($id, ScoreTransformer::TYPE_SOLO, null);
+        return static::beatmapScores($id, false, null);
     }
 
     public function updateOwner($id)

app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php

@@ -64,7 +64,7 @@ public function index($roomId, $playlistId)
             ->limit($limit)
             ->getWithHasMore();
 
-        $transformer = ScoreTransformer::newSolo();
+        $transformer = new ScoreTransformer(false);
         $scoresJson = json_collection(
             $highScores->pluck('scoreLink'),
             $transformer,
@@ -127,7 +127,7 @@ public function show($roomId, $playlistId, $id)
 
         return json_item(
             $scoreLink,
-            ScoreTransformer::newSolo(),
+            new ScoreTransformer(false),
             [
                 ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES,
                 'position',
@@ -159,7 +159,7 @@ public function showUser($roomId, $playlistId, $userId)
 
         return json_item(
             $scoreLink,
-            ScoreTransformer::newSolo(),
+            new ScoreTransformer(false),
             [
                 ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES,
                 'position',
@@ -225,7 +225,7 @@ public function update($roomId, $playlistItemId, $tokenId)
 
         return json_item(
             $scoreLink,
-            ScoreTransformer::newSolo(),
+            new ScoreTransformer(false),
             [
                 ...ScoreTransformer::MULTIPLAYER_BASE_INCLUDES,
                 'position',

app/Http/Controllers/ScoresController.php

@@ -197,7 +197,7 @@ function () use ($cursor, $isOldScores, $rulesetId) {
                 }
 
                 return [
-                    'scores' => json_collection($filteredScores, new ScoreTransformer(ScoreTransformer::TYPE_SOLO)),
+                    'scores' => json_collection($filteredScores, new ScoreTransformer(false)),
                     // return previous cursor if no result, assuming there's no new scores yet
                     ...cursor_for_response($cursorHelper->next($filteredScores) ?? $cursor),
                 ];

app/Http/Controllers/Solo/ScoresController.php

@@ -53,6 +53,6 @@ public function store($beatmapId, $tokenId)
             $score->queueForProcessing();
         }
 
-        return json_item($score, new ScoreTransformer(ScoreTransformer::TYPE_SOLO));
+        return json_item($score, new ScoreTransformer(false));
     }
 }

app/Transformers/LegacyMatch/GameTransformer.php

@@ -45,7 +45,7 @@ public function includeScores(Game $game)
     {
         return $this->collection(
             $game->scores,
-            new ScoreTransformer(ScoreTransformer::TYPE_LEGACY)
+            new ScoreTransformer(true)
         );
     }
 }

app/Transformers/Multiplayer/PlaylistItemTransformer.php

@@ -46,7 +46,7 @@ public function includeScores(PlaylistItem $item)
     {
         return $this->collection(
             $item->scoreLinks,
-            ScoreTransformer::newSolo()
+            new ScoreTransformer(false)
         );
     }
 }

app/Transformers/ScoreTransformer.php

@@ -29,9 +29,6 @@ class ScoreTransformer extends TransformerAbstract
         'scoreLink.user.country',
     ];
 
-    const TYPE_LEGACY = 'legacy';
-    const TYPE_SOLO = 'solo';
-
     // TODO: user include is deprecated.
     const USER_PROFILE_INCLUDES = ['beatmap', 'beatmapset', 'user'];
     const USER_PROFILE_INCLUDES_PRELOAD = [
@@ -61,38 +58,19 @@ class ScoreTransformer extends TransformerAbstract
         'current_user_attributes',
     ];
 
-    private string $transformFunction;
+    private bool $legacyFormat;
 
-    public static function newSolo(): static
+    public function __construct(?bool $legacyFormat = null)
     {
-        return new static(static::TYPE_SOLO);
-    }
-
-    public function __construct(?string $type = null)
-    {
-        $type ??= is_api_request() && api_version() < 20220705
-            ? static::TYPE_LEGACY
-            : static::TYPE_SOLO;
-
-        switch ($type) {
-            case static::TYPE_LEGACY:
-                $this->transformFunction = 'transformLegacy';
-                break;
-            case static::TYPE_SOLO:
-                $this->transformFunction = 'transformSolo';
-                break;
-        }
+        $this->legacyFormat = $legacyFormat ?? (is_api_request() && api_version() < 20220705);
     }
 
     public function transform(LegacyMatch\Score|MultiplayerScoreLink|ScoreModel|SoloScore $score)
     {
-        $fn = $this->transformFunction;
-
-        return $this->$fn($score);
-    }
+        if ($this->legacyFormat) {
+            return $this->transformLegacy($score);
+        }
 
-    public function transformSolo(MultiplayerScoreLink|ScoreModel|SoloScore $score)
-    {
         $extraAttributes = [];
 
         if ($score instanceof MultiplayerScoreLink) {
@@ -237,8 +215,7 @@ public function includePosition(MultiplayerScoreLink $scoreLink)
     public function includeScoresAround(MultiplayerScoreLink $scoreLink)
     {
         static $limit = 10;
-        static $transformer;
-        $transformer ??= static::newSolo();
+        static $transformer = new static(false);
 
         return $this->primitive(array_map(
             function ($item) use ($limit, $transformer) {