From cd39f444efe4124f7db47276ec4b69c65c1b4453 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Jul 2022 15:18:12 +0900
Subject: [PATCH] Expose event from `OnlineMetadataClient` rather than calling
 `BeatmapUpdater` directly

---
 osu.Game/Online/Metadata/MetadataClient.cs       | 10 ++++++++++
 osu.Game/Online/Metadata/OnlineMetadataClient.cs | 16 +---------------
 osu.Game/OsuGameBase.cs                          |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Online/Metadata/MetadataClient.cs b/osu.Game/Online/Metadata/MetadataClient.cs
index 1e5eeb4eb0..60867da2d7 100644
--- a/osu.Game/Online/Metadata/MetadataClient.cs
+++ b/osu.Game/Online/Metadata/MetadataClient.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Graphics;
 
@@ -11,5 +13,13 @@ namespace osu.Game.Online.Metadata
         public abstract Task BeatmapSetsUpdated(BeatmapUpdates updates);
 
         public abstract Task<BeatmapUpdates> GetChangesSince(int queueId);
+
+        public Action<int[]>? ChangedBeatmapSetsArrived;
+
+        protected Task ProcessChanges(int[] beatmapSetIDs)
+        {
+            ChangedBeatmapSetsArrived?.Invoke(beatmapSetIDs.Distinct().ToArray());
+            return Task.CompletedTask;
+        }
     }
 }
diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 1b0d1884dc..95228c380f 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
-using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Online.API;
 
@@ -15,7 +14,6 @@ namespace osu.Game.Online.Metadata
 {
     public class OnlineMetadataClient : MetadataClient
     {
-        private readonly BeatmapUpdater beatmapUpdater;
         private readonly string endpoint;
 
         private IHubClientConnector? connector;
@@ -24,9 +22,8 @@ namespace osu.Game.Online.Metadata
 
         private HubConnection? connection => connector?.CurrentConnection;
 
-        public OnlineMetadataClient(EndpointConfiguration endpoints, BeatmapUpdater beatmapUpdater)
+        public OnlineMetadataClient(EndpointConfiguration endpoints)
         {
-            this.beatmapUpdater = beatmapUpdater;
             endpoint = endpoints.MetadataEndpointUrl;
         }
 
@@ -102,17 +99,6 @@ namespace osu.Game.Online.Metadata
             await ProcessChanges(updates.BeatmapSetIDs);
         }
 
-        protected Task ProcessChanges(int[] beatmapSetIDs)
-        {
-            foreach (int id in beatmapSetIDs)
-            {
-                Logger.Log($"Processing {id}...");
-                beatmapUpdater.Queue(id);
-            }
-
-            return Task.CompletedTask;
-        }
-
         public override Task<BeatmapUpdates> GetChangesSince(int queueId)
         {
             if (connector?.IsConnected.Value != true)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4b5c9c0815..c060723152 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -287,7 +287,7 @@ namespace osu.Game
 
             dependencies.CacheAs(spectatorClient = new OnlineSpectatorClient(endpoints));
             dependencies.CacheAs(multiplayerClient = new OnlineMultiplayerClient(endpoints));
-            dependencies.CacheAs(metadataClient = new OnlineMetadataClient(endpoints, beatmapUpdater));
+            dependencies.CacheAs(metadataClient = new OnlineMetadataClient(endpoints));
 
             BeatmapManager.ProcessBeatmap = set => beatmapUpdater.Process(set);