Fix solo leaderboard sometimes not showing user position while it technically could

The "partial" leaderboard logic in `SoloGameplayLeaderboardProvider`
always assumed the online fetch would request 50 scores, which is no
longer the case after #33100.

Author: bdach

osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs

@@ -105,7 +105,7 @@ public void TestDisplay()
                     new ScoreInfo { User = new APIUser { Username = "Top", Id = 2 }, TotalScore = 900_000, Accuracy = 0.99, MaxCombo = 999 },
                     new ScoreInfo { User = new APIUser { Username = "Second", Id = 14 }, TotalScore = 800_000, Accuracy = 0.9, MaxCombo = 888 },
                     new ScoreInfo { User = friend, TotalScore = 700_000, Accuracy = 0.88, MaxCombo = 777 },
-                }, 3, null);
+                }, scoresRequested: 50, totalScores: 3, null);
             });
 
             createLeaderboard();
@@ -144,7 +144,7 @@ public void TestLongScores()
                     new ScoreInfo { User = new APIUser { Username = "Top", Id = 2 }, TotalScore = 900_000_000, Accuracy = 0.99, MaxCombo = 999999 },
                     new ScoreInfo { User = new APIUser { Username = "Second", Id = 14 }, TotalScore = 800_000_000, Accuracy = 0.9, MaxCombo = 888888 },
                     new ScoreInfo { User = friend, TotalScore = 700_000_000, Accuracy = 0.88, MaxCombo = 777777 },
-                }, 3, null);
+                }, scoresRequested: 50, totalScores: 3, null);
             });
 
             createLeaderboard();
@@ -170,7 +170,7 @@ public void TestLayoutWithManyScores()
                     scores.Add(new ScoreInfo { User = new APIUser { Username = $"Player {i + 1}" }, TotalScore = RNG.Next(700_000, 1_000_000) });
 
                 // this is dodgy but anything less dodgy is a lot of work
-                ((Bindable<LeaderboardScores?>)leaderboardManager.Scores).Value = LeaderboardScores.Success(scores, scores.Count, null);
+                ((Bindable<LeaderboardScores?>)leaderboardManager.Scores).Value = LeaderboardScores.Success(scores, scoresRequested: 50, scores.Count, null);
                 gameplayState.ScoreProcessor.TotalScore.Value = 0;
             });
 
@@ -208,7 +208,7 @@ public void TestExistingUsers()
                     new ScoreInfo { User = new APIUser { Username = "smoogipoo", Id = 1040328 }, TotalScore = 800_000, Accuracy = 0.9, MaxCombo = 888 },
                     new ScoreInfo { User = new APIUser { Username = "flyte", Id = 3103765 }, TotalScore = 700_000, Accuracy = 0.9, MaxCombo = 888 },
                     new ScoreInfo { User = new APIUser { Username = "frenzibyte", Id = 14210502 }, TotalScore = 600_000, Accuracy = 0.9, MaxCombo = 777 },
-                }, 4, null);
+                }, scoresRequested: 50, totalScores: 4, null);
             });
 
             createLeaderboard();
@@ -223,7 +223,7 @@ public void TestQuitScore()
                 ((Bindable<LeaderboardScores?>)leaderboardManager.Scores).Value = LeaderboardScores.Success(new[]
                 {
                     new ScoreInfo { User = new APIUser { Username = "Quit", Id = 3 }, TotalScore = 100_000, Accuracy = 0.99, MaxCombo = 999 },
-                }, 1, null);
+                }, scoresRequested: 50, totalScores: 1, null);
             });
 
             createLeaderboard();

osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboardProvider.cs

@@ -37,7 +37,8 @@ public void TestLocalLeaderboardHasPositionsAutofilled()
                         TotalScore = 10_000 * (100 - i),
                         Position = i,
                     }).ToArray(),
-                    1337,
+                    scoresRequested: 100,
+                    totalScores: 100,
                     null
                 );
             });
@@ -84,7 +85,8 @@ public void TestFullGlobalLeaderboard()
                         TotalScore = 600_000 + 10_000 * (40 - i),
                         Position = i,
                     }).ToArray(),
-                    1337,
+                    scoresRequested: 50,
+                    totalScores: 40,
                     null
                 );
             });
@@ -131,7 +133,8 @@ public void TestPartialGlobalLeaderboard()
                         TotalScore = 500_000 + 10_000 * (50 - i),
                         Position = i
                     }).ToArray(),
-                    1337,
+                    scoresRequested: 50,
+                    totalScores: 1337,
                     new ScoreInfo { TotalScore = 200_000 }
                 );
             });

osu.Game/Online/API/Requests/GetScoresRequest.cs

@@ -20,6 +20,8 @@ public class GetScoresRequest : APIRequest<APIScoresCollection>, IEquatable<GetS
         public const int DEFAULT_SCORES_PER_REQUEST = 50;
         public const int MAX_SCORES_PER_REQUEST = 100;
 
+        public int ScoresRequested { get; }
+
         private readonly IBeatmapInfo beatmapInfo;
         private readonly BeatmapLeaderboardScope scope;
         private readonly IRulesetInfo ruleset;
@@ -37,6 +39,8 @@ public GetScoresRequest(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset, BeatmapL
             this.scope = scope;
             this.ruleset = ruleset ?? throw new ArgumentNullException(nameof(ruleset));
             this.mods = mods ?? Array.Empty<IMod>();
+
+            ScoresRequested = this.scope.RequiresSupporter(this.mods.Any()) ? MAX_SCORES_PER_REQUEST : DEFAULT_SCORES_PER_REQUEST;
         }
 
         protected override string Target => $@"beatmaps/{beatmapInfo.OnlineID}/scores";
@@ -51,7 +55,7 @@ protected override WebRequest CreateWebRequest()
             foreach (var mod in mods)
                 req.AddParameter(@"mods[]", mod.Acronym);
 
-            req.AddParameter(@"limit", (scope.RequiresSupporter(mods.Any()) ? MAX_SCORES_PER_REQUEST : DEFAULT_SCORES_PER_REQUEST).ToString(CultureInfo.InvariantCulture));
+            req.AddParameter(@"limit", ScoresRequested.ToString(CultureInfo.InvariantCulture));
             return req;
         }
 

osu.Game/Online/Leaderboards/LeaderboardManager.cs

@@ -144,7 +144,8 @@ public void FetchWithCriteria(LeaderboardCriteria newCriteria, bool forceRefresh
                                         return s;
                                     })
                                     .ToArray(),
-                            response.ScoresCount,
+                            scoresRequested: newRequest.ScoresRequested,
+                            totalScores: response.ScoresCount,
                             response.UserScore?.CreateScoreInfo(rulesets, newCriteria.Beatmap)
                         );
                         inFlightOnlineRequest = null;
@@ -194,7 +195,7 @@ private void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? c
             newScores = newScores.Detach().OrderByCriteria(CurrentCriteria.Sorting);
 
             var newScoresArray = newScores.ToArray();
-            scores.Value = LeaderboardScores.Success(newScoresArray, newScoresArray.Length, null);
+            scores.Value = LeaderboardScores.Success(newScoresArray, scoresRequested: newScoresArray.Length, totalScores: newScoresArray.Length, null);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -215,9 +216,33 @@ public record LeaderboardCriteria(
 
     public record LeaderboardScores
     {
+        /// <summary>
+        /// The collection of all scores received through the leaderboard lookup.
+        /// </summary>
         public ICollection<ScoreInfo> TopScores { get; }
+
+        /// <summary>
+        /// The number of scores which was requested.
+        /// Used to determine whether the returned leaderboard can be judged to be a partial or full leaderboard
+        /// (i.e. whether <see cref="TopScores"/> contains all scores that it could ever contain).
+        /// </summary>
+        public int ScoresRequested { get; }
+
+        /// <summary>
+        /// The number of all scores that exist on the leaderboard.
+        /// </summary>
         public int TotalScores { get; }
+
+        public bool IsPartial => ScoresRequested < TotalScores;
+
+        /// <summary>
+        /// The local user's best score.
+        /// </summary>
         public ScoreInfo? UserScore { get; }
+
+        /// <summary>
+        /// The failure state that occurred when attempting to retrieve the leaderboard.
+        /// </summary>
         public LeaderboardFailState? FailState { get; }
 
         public IEnumerable<ScoreInfo> AllScores
@@ -232,16 +257,20 @@ public IEnumerable<ScoreInfo> AllScores
             }
         }
 
-        private LeaderboardScores(ICollection<ScoreInfo> topScores, int totalScores, ScoreInfo? userScore, LeaderboardFailState? failState)
+        private LeaderboardScores(ICollection<ScoreInfo> topScores, int scoresRequested, int totalScores, ScoreInfo? userScore, LeaderboardFailState? failState)
         {
             TopScores = topScores;
+            ScoresRequested = scoresRequested;
             TotalScores = totalScores;
             UserScore = userScore;
             FailState = failState;
         }
 
-        public static LeaderboardScores Success(ICollection<ScoreInfo> topScores, int totalScores, ScoreInfo? userScore) => new LeaderboardScores(topScores, totalScores, userScore, null);
-        public static LeaderboardScores Failure(LeaderboardFailState failState) => new LeaderboardScores([], 0, null, failState);
+        public static LeaderboardScores Success(ICollection<ScoreInfo> topScores, int scoresRequested, int totalScores, ScoreInfo? userScore)
+            => new LeaderboardScores(topScores, scoresRequested, totalScores, userScore, null);
+
+        public static LeaderboardScores Failure(LeaderboardFailState failState)
+            => new LeaderboardScores([], scoresRequested: 0, totalScores: 0, null, failState);
     }
 
     public enum LeaderboardFailState

osu.Game/Screens/Ranking/SoloResultsScreen.cs

@@ -120,7 +120,7 @@ protected override async Task<ScoreInfo[]> FetchScores()
             sortedScores = sortedScores.OrderByTotalScore().ToList();
 
             int delta = 0;
-            bool isPartialLeaderboard = leaderboardManager.CurrentCriteria?.Scope != BeatmapLeaderboardScope.Local && result.TopScores.Count >= 50;
+            bool isPartialLeaderboard = result.IsPartial;
 
             for (int i = 0; i < sortedScores.Count; i++)
             {

osu.Game/Screens/Select/Leaderboards/SoloGameplayLeaderboardProvider.cs

@@ -33,7 +33,7 @@ protected override void LoadComplete()
 
             var globalScores = leaderboardManager?.Scores.Value;
 
-            isPartial = leaderboardManager?.CurrentCriteria?.Scope != BeatmapLeaderboardScope.Local && globalScores?.TopScores.Count >= 50;
+            isPartial = globalScores == null || globalScores.IsPartial;
 
             List<GameplayLeaderboardScore> newScores = new List<GameplayLeaderboardScore>();