Merge pull request #11109 from nanaya/score-rank-filter

Use correct score rank when searching in legacy mode

Author: notbakaneko

Diff for: app/Libraries/Search/BeatmapsetSearch.php

@@ -433,9 +433,8 @@ private function getPlayedBeatmapIds(?array $rank = null)
         }
 
         $topScores = [];
-        $scoreField = ScoreSearchParams::showLegacyForUser($this->params->user)
-            ? 'legacy_total_score'
-            : 'total_score';
+        $showLegacyOnly = ScoreSearchParams::showLegacyForUser($this->params->user) ?? false;
+        $scoreField = $showLegacyOnly ? 'legacy_total_score' : 'total_score';
         foreach ($query->get() as $score) {
             $prevScore = $topScores[$score->beatmap_id] ?? null;
 
@@ -445,6 +444,12 @@ private function getPlayedBeatmapIds(?array $rank = null)
             }
         }
 
+        if ($showLegacyOnly) {
+            foreach ($topScores as $beatmapId => $score) {
+                $topScores[$beatmapId] = $score->makeLegacyEntry();
+            }
+        }
+
         $ret = [];
         $rankSet = new Set($rank);
         foreach ($topScores as $beatmapId => $score) {