From 68c040175a4f026ca450f07fa060f9b86d16c962 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 17:01:44 +0900
Subject: [PATCH] Ensure `Leaderboard.Scores` is updated immediately via
 request flow

---
 osu.Game/Online/Leaderboards/Leaderboard.cs   | 22 +++++++++++++------
 .../Select/Leaderboards/BeatmapLeaderboard.cs | 13 +++++------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 9b6e9fbec7..d5834c4329 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -185,14 +185,22 @@ namespace osu.Game.Online.Leaderboards
             if (scores != null)
                 this.scores.AddRange(scores);
 
-            userScoreContainer.Score.Value = userScore;
+            // Schedule needs to be non-delayed here for the weird logic in refetchScores to work.
+            // If it is removed, the placeholder will be incorrectly updated to "no scores" rather than "retrieving".
+            // This whole flow should be refactored in the future.
+            Scheduler.Add(applyNewScores, false);
 
-            if (userScore == null)
-                userScoreContainer.Hide();
-            else
-                userScoreContainer.Show();
+            void applyNewScores()
+            {
+                userScoreContainer.Score.Value = userScore;
 
-            Scheduler.Add(updateScoresDrawables, false);
+                if (userScore == null)
+                    userScoreContainer.Hide();
+                else
+                    userScoreContainer.Show();
+
+                updateScoresDrawables();
+            }
         }
 
         /// <summary>
@@ -212,8 +220,8 @@ namespace osu.Game.Online.Leaderboards
             Debug.Assert(ThreadSafety.IsUpdateThread);
 
             cancelPendingWork();
-            SetScores(null);
 
+            SetScores(null);
             setState(LeaderboardState.Retrieving);
 
             currentFetchCancellationSource = new CancellationTokenSource();
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index ed4da5e848..798cf29715 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -148,13 +148,10 @@ namespace osu.Game.Screens.Select.Leaderboards
 
             var req = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
 
-            req.Success += r => Schedule(() =>
-            {
-                SetScores(
-                    scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
-                    r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
-                );
-            });
+            req.Success += r => SetScores(
+                scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
+                r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
+            );
 
             return req;
         }
@@ -209,7 +206,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
                 scores = scoreManager.OrderByTotalScore(scores.Detach());
 
-                Schedule(() => SetScores(scores));
+                SetScores(scores);
             }
         }