Fix daily challenge results screen fetching scores beginning from the user's highest

osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallenge.cs

@@ -345,7 +345,7 @@ [new MatchChatDisplay(room) { RelativeSizeAxes = Axes.Both }]
         private void presentScore(long id)
         {
             if (this.IsCurrentScreen())
-                this.Push(new PlaylistItemScoreResultsScreen(room.RoomID!.Value, playlistItem, id));
+                this.Push(new PlaylistItemScoreResultsScreen(id, room.RoomID!.Value, playlistItem));
         }
 
         private void onRoomScoreSet(MultiplayerRoomScoreSetEvent e)

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs

@@ -7,7 +7,7 @@
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public partial class MultiplayerResultsScreen : PlaylistItemUserResultsScreen
+    public partial class MultiplayerResultsScreen : PlaylistItemScoreResultsScreen
     {
         public MultiplayerResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem)

osu.Game/Screens/OnlinePlay/Playlists/PlaylistItemResultsScreen.cs

@@ -191,8 +191,8 @@ protected virtual ScoreInfo[] PerformSuccessCallback(Action<IEnumerable<ScoreInf
         {
             var scoreInfos = scores.Select(s => s.CreateScoreInfo(ScoreManager, Rulesets, PlaylistItem, Beatmap.Value.BeatmapInfo)).OrderByTotalScore().ToArray();
 
-            // Invoke callback to add the scores.
-            callback.Invoke(scoreInfos);
+            // Invoke callback to add the scores. Exclude the score provided to this screen since it's added already.
+            callback.Invoke(scoreInfos.Where(s => s.OnlineID != Score?.OnlineID));
 
             return scoreInfos;
         }

osu.Game/Screens/OnlinePlay/Playlists/PlaylistItemScoreResultsScreen.cs

@@ -11,13 +11,19 @@
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     /// <summary>
-    /// Shows a selected arbitrary score for a playlist item, with scores around included.
+    /// Shows a given score in a playlist item, with scores around included.
     /// </summary>
     public partial class PlaylistItemScoreResultsScreen : PlaylistItemResultsScreen
     {
         private readonly long scoreId;
 
-        public PlaylistItemScoreResultsScreen(long roomId, PlaylistItem playlistItem, long scoreId)
+        public PlaylistItemScoreResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem)
+            : base(score, roomId, playlistItem)
+        {
+            scoreId = score.OnlineID;
+        }
+
+        public PlaylistItemScoreResultsScreen(long scoreId, long roomId, PlaylistItem playlistItem)
             : base(null, roomId, playlistItem)
         {
             this.scoreId = scoreId;
@@ -28,9 +34,7 @@ public PlaylistItemScoreResultsScreen(long roomId, PlaylistItem playlistItem, lo
         protected override ScoreInfo[] PerformSuccessCallback(Action<IEnumerable<ScoreInfo>> callback, List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
         {
             var scoreInfos = base.PerformSuccessCallback(callback, scores, pivot);
-
-            Schedule(() => SelectedScore.Value ??= scoreInfos.SingleOrDefault(score => score.OnlineID == scoreId));
-
+            Schedule(() => SelectedScore.Value ??= scoreInfos.SingleOrDefault(s => s.OnlineID == scoreId));
             return scoreInfos;
         }
     }

osu.Game/Screens/OnlinePlay/Playlists/PlaylistItemUserBestResultsScreen.cs

@@ -0,0 +1,41 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.OnlinePlay.Playlists
+{
+    /// <summary>
+    /// Shows a user's best score in a playlist item, with scores around included.
+    /// </summary>
+    public partial class PlaylistItemUserBestResultsScreen : PlaylistItemResultsScreen
+    {
+        private readonly int userId;
+
+        public PlaylistItemUserBestResultsScreen(long roomId, PlaylistItem playlistItem, int userId)
+            : base(null, roomId, playlistItem)
+        {
+            this.userId = userId;
+        }
+
+        protected override APIRequest<MultiplayerScore> CreateScoreRequest() => new ShowPlaylistUserScoreRequest(RoomId, PlaylistItem.ID, userId);
+
+        protected override ScoreInfo[] PerformSuccessCallback(Action<IEnumerable<ScoreInfo>> callback, List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
+        {
+            var scoreInfos = base.PerformSuccessCallback(callback, scores, pivot);
+
+            Schedule(() =>
+            {
+                // Prefer selecting the local user's score, or otherwise default to the first visible score.
+                SelectedScore.Value ??= scoreInfos.FirstOrDefault(s => s.UserID == userId) ?? scoreInfos.FirstOrDefault();
+            });
+
+            return scoreInfos;
+        }
+    }
+}

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs

@@ -56,7 +56,7 @@ public override bool OnExiting(ScreenExitEvent e)
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
             Debug.Assert(Room.RoomID != null);
-            return new PlaylistItemUserResultsScreen(score, Room.RoomID.Value, PlaylistItem)
+            return new PlaylistItemScoreResultsScreen(score, Room.RoomID.Value, PlaylistItem)
             {
                 AllowRetry = true,
                 ShowUserStatistics = true,

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs

@@ -12,6 +12,7 @@
 using osu.Framework.Screens;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -32,6 +33,9 @@ public partial class PlaylistsRoomSubScreen : RoomSubScreen
 
         private readonly IBindable<bool> isIdle = new BindableBool();
 
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
         [Resolved(CanBeNull = true)]
         private IdleTracker? idleTracker { get; set; }
 
@@ -143,7 +147,7 @@ private void updateRoomPlaylist()
                                             RequestResults = item =>
                                             {
                                                 Debug.Assert(Room.RoomID != null);
-                                                ParentScreen?.Push(new PlaylistItemUserResultsScreen(null, Room.RoomID.Value, item));
+                                                ParentScreen?.Push(new PlaylistItemUserBestResultsScreen(Room.RoomID.Value, item, api.LocalUser.Value.Id));
                                             }
                                         }
                                     },