Merge pull request #34209 from smoogipoo/playlist-results-no-submission-no-indexing

Make online play results not request leaderboard on failed submission

Author: bdach

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs

@@ -274,6 +274,29 @@ public void TestFetchingAllTheWayToFirstNeverDisplaysNegativePosition()
             AddUntilStep("all panels have non-negative position", () => this.ChildrenOfType<ScorePanel>().All(p => p.ScorePosition.Value > 0));
         }
 
+        [Test]
+        public void TestPresentInvalidOnlineScore()
+        {
+            AddStep("set up invalid user score", () =>
+            {
+                userScore.OnlineID = -1;
+                userScore.TotalScore = 0;
+            });
+
+            AddStep("bind user score info handler", () => bindHandler(userScore: userScore));
+
+            createResultsWithScore(() => userScore);
+
+            AddUntilStep("wait for user score to be displayed", () => resultsScreen.ChildrenOfType<ScorePanelList>().Single().GetScorePanels().Any());
+            AddWaitStep("wait for any more potential scores", 5);
+            AddAssert("only 1 score visible", () => resultsScreen.ChildrenOfType<ScorePanelList>().Single().GetScorePanels().Count(), () => Is.EqualTo(1));
+
+            AddUntilStep("left loading spinner hidden", () =>
+                resultsScreen.ChildrenOfType<LoadingSpinner>().Single(l => l.Anchor == Anchor.CentreLeft).State.Value == Visibility.Hidden);
+            AddUntilStep("right loading spinner hidden", () =>
+                resultsScreen.ChildrenOfType<LoadingSpinner>().Single(l => l.Anchor == Anchor.CentreRight).State.Value == Visibility.Hidden);
+        }
+
         private void createResultsWithScore(Func<ScoreInfo> getScore)
         {
             AddStep("load results", () =>
@@ -359,15 +382,15 @@ private void bindHandler(bool delayed = false, ScoreInfo? userScore = null, bool
                 switch (request)
                 {
                     case ShowPlaylistScoreRequest s:
-                        if (userScore == null)
+                        if (userScore == null || userScore.OnlineID == -1)
                             triggerFail(s);
                         else
                             triggerSuccess(s, () => createUserResponse(userScore));
 
                         break;
 
                     case ShowPlaylistUserScoreRequest u:
-                        if (userScore == null)
+                        if (userScore == null || userScore.OnlineID == -1)
                             triggerFail(u);
                         else
                             triggerSuccess(u, () => createUserResponse(userScore));

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

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using System.Threading.Tasks;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
@@ -27,6 +28,20 @@ public PlaylistItemScoreResultsScreen(long scoreId, long roomId, PlaylistItem pl
             this.scoreId = scoreId;
         }
 
+        protected override Task<ScoreInfo[]> FetchScores()
+        {
+            // Don't attempt to index scores if the given score has an invalid online ID.
+            // This can happen if the score failed to submit but is otherwise in a presentable state.
+            return scoreId <= 0 ? Task.FromResult<ScoreInfo[]>([]) : base.FetchScores();
+        }
+
+        protected override Task<ScoreInfo[]> FetchNextPage(int direction)
+        {
+            // Don't attempt to index scores if the given score has an invalid online ID.
+            // This can happen if the score failed to submit but is otherwise in a presentable state.
+            return scoreId <= 0 ? Task.FromResult<ScoreInfo[]>([]) : base.FetchNextPage(direction);
+        }
+
         protected override APIRequest<MultiplayerScore> CreateScoreRequest() => new ShowPlaylistScoreRequest(RoomId, PlaylistItem.ID, scoreId);
 
         protected override void OnScoresAdded(ScoreInfo[] scores)