From 631bfadd68f2a58ef51f7d17c10271bfddc34de5 Mon Sep 17 00:00:00 2001
From: Salman Alshamrani <frenzibyte@gmail.com>
Date: Sun, 24 Nov 2024 04:10:01 -0500
Subject: [PATCH] Replace event subscription with callback in
 `UserStatisticsWatcher`

Also no longer cancels previous API requests as there's no actual need to do it.
---
 .../Online/LocalUserStatisticsProvider.cs     | 19 +++++++----------
 osu.Game/Online/UserStatisticsWatcher.cs      | 21 +++++--------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Online/LocalUserStatisticsProvider.cs b/osu.Game/Online/LocalUserStatisticsProvider.cs
index a25f5b05aa..5fa2b40715 100644
--- a/osu.Game/Online/LocalUserStatisticsProvider.cs
+++ b/osu.Game/Online/LocalUserStatisticsProvider.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Online
         private IAPIProvider api { get; set; } = null!;
 
         private readonly Dictionary<string, UserStatistics> statisticsCache = new Dictionary<string, UserStatistics>();
-        private readonly Dictionary<string, GetUserRequest> statisticsRequests = new Dictionary<string, GetUserRequest>();
 
         /// <summary>
         /// Returns the <see cref="UserStatistics"/> currently available for the given ruleset.
@@ -62,23 +61,21 @@ namespace osu.Game.Online
                 RefetchStatistics(ruleset);
         }
 
-        public void RefetchStatistics(RulesetInfo ruleset)
+        public void RefetchStatistics(RulesetInfo ruleset, Action<UserStatisticsUpdate>? callback = null)
         {
-            if (statisticsRequests.TryGetValue(ruleset.ShortName, out var previousRequest))
-                previousRequest.Cancel();
-
-            var request = statisticsRequests[ruleset.ShortName] = new GetUserRequest(api.LocalUser.Value.Id, ruleset);
-            request.Success += u => UpdateStatistics(u.Statistics, ruleset);
+            var request = new GetUserRequest(api.LocalUser.Value.Id, ruleset);
+            request.Success += u => UpdateStatistics(u.Statistics, ruleset, callback);
             api.Queue(request);
         }
 
-        protected void UpdateStatistics(UserStatistics newStatistics, RulesetInfo ruleset)
+        protected void UpdateStatistics(UserStatistics newStatistics, RulesetInfo ruleset, Action<UserStatisticsUpdate>? callback = null)
         {
             var oldStatistics = statisticsCache.GetValueOrDefault(ruleset.ShortName);
-
-            statisticsRequests.Remove(ruleset.ShortName);
             statisticsCache[ruleset.ShortName] = newStatistics;
-            StatisticsUpdated?.Invoke(new UserStatisticsUpdate(ruleset, oldStatistics, newStatistics));
+
+            var update = new UserStatisticsUpdate(ruleset, oldStatistics, newStatistics);
+            callback?.Invoke(update);
+            StatisticsUpdated?.Invoke(update);
         }
     }
 
diff --git a/osu.Game/Online/UserStatisticsWatcher.cs b/osu.Game/Online/UserStatisticsWatcher.cs
index 8ed1ff594d..73ca3c9f53 100644
--- a/osu.Game/Online/UserStatisticsWatcher.cs
+++ b/osu.Game/Online/UserStatisticsWatcher.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Online
         public IBindable<ScoreBasedUserStatisticsUpdate?> LatestUpdate => latestUpdate;
         private readonly Bindable<ScoreBasedUserStatisticsUpdate?> latestUpdate = new Bindable<ScoreBasedUserStatisticsUpdate?>();
 
-        private ScoreInfo? scorePendingUpdate;
-
         [Resolved]
         private SpectatorClient spectatorClient { get; set; } = null!;
 
@@ -43,7 +41,6 @@ namespace osu.Game.Online
             base.LoadComplete();
 
             spectatorClient.OnUserScoreProcessed += userScoreProcessed;
-            statisticsProvider.StatisticsUpdated += onStatisticsUpdated;
         }
 
         /// <summary>
@@ -72,21 +69,13 @@ namespace osu.Game.Online
             if (!watchedScores.Remove(scoreId, out var scoreInfo))
                 return;
 
-            scorePendingUpdate = scoreInfo;
-            statisticsProvider.RefetchStatistics(scoreInfo.Ruleset);
+            statisticsProvider.RefetchStatistics(scoreInfo.Ruleset, u => Schedule(() =>
+            {
+                if (u.OldStatistics != null)
+                    latestUpdate.Value = new ScoreBasedUserStatisticsUpdate(scoreInfo, u.OldStatistics, u.NewStatistics);
+            }));
         }
 
-        private void onStatisticsUpdated(UserStatisticsUpdate update) => Schedule(() =>
-        {
-            if (scorePendingUpdate == null || !update.Ruleset.Equals(scorePendingUpdate.Ruleset))
-                return;
-
-            if (update.OldStatistics != null)
-                latestUpdate.Value = new ScoreBasedUserStatisticsUpdate(scorePendingUpdate, update.OldStatistics, update.NewStatistics);
-
-            scorePendingUpdate = null;
-        });
-
         protected override void Dispose(bool isDisposing)
         {
             if (spectatorClient.IsNotNull())