From 77698ec31e8cae2550c2dac2d68bae51ab2805a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 31 Aug 2020 19:54:57 +0900
Subject: [PATCH] Add support for showing own top score in timeshift

---
 osu.Game/Online/Multiplayer/APILeaderboard.cs  | 18 ++++++++++++++++++
 .../Multi/Match/Components/MatchLeaderboard.cs |  6 ++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/APILeaderboard.cs

diff --git a/osu.Game/Online/Multiplayer/APILeaderboard.cs b/osu.Game/Online/Multiplayer/APILeaderboard.cs
new file mode 100644
index 0000000000..96fe7cefb0
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/APILeaderboard.cs
@@ -0,0 +1,18 @@
+// 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.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Online.Multiplayer
+{
+    public class APILeaderboard
+    {
+        [JsonProperty("leaderboard")]
+        public List<APIUserScoreAggregate> Leaderboard;
+
+        [JsonProperty("own_score")]
+        public APIUserScoreAggregate OwnScore;
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 56381dccb6..847f3a7b55 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Screens.Multi.Match.Components
 {
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
-        public Action<IEnumerable<APIUserScoreAggregate>> ScoresLoaded;
-
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
@@ -43,8 +41,8 @@ namespace osu.Game.Screens.Multi.Match.Components
 
             req.Success += r =>
             {
-                scoresCallback?.Invoke(r);
-                ScoresLoaded?.Invoke(r);
+                scoresCallback?.Invoke(r.Leaderboard);
+                TopScore = r.OwnScore;
             };
 
             return req;