From c6160d53044b35abd0ee8168b0bb28344dd4d345 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 21:17:33 +0900
Subject: [PATCH] Only ignore online score id for database import

---
 osu.Game/Screens/Play/Player.cs           | 17 ++++++++++++++---
 osu.Game/Screens/Play/SubmittingPlayer.cs |  7 +------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 890883f0d2..6317a41bec 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -929,11 +929,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="score">The <see cref="Score"/> to import.</param>
         /// <returns>The imported score.</returns>
-        protected virtual Task ImportScore(Score score)
+        protected virtual async Task ImportScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
-                return Task.CompletedTask;
+                return;
 
             LegacyByteArrayReader replayReader;
 
@@ -943,7 +943,18 @@ namespace osu.Game.Screens.Play
                 replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            return scoreManager.Import(score.ScoreInfo, replayReader);
+            // For the time being, online ID responses are not really useful for anything.
+            // In addition, the IDs provided via new (lazer) endpoints are based on a different autoincrement from legacy (stable) scores.
+            //
+            // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
+            // conflicts across various systems (ie. solo and multiplayer).
+            long? onlineScoreId = score.ScoreInfo.OnlineScoreID;
+            score.ScoreInfo.OnlineScoreID = null;
+
+            await scoreManager.Import(score.ScoreInfo, replayReader).ConfigureAwait(false);
+
+            // ... And restore the online ID for other processes to handle correctly (e.g. de-duplication for the results screen).
+            score.ScoreInfo.OnlineScoreID = onlineScoreId;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d5ad87c70c..23b9037244 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -116,12 +116,7 @@ namespace osu.Game.Screens.Play
 
             request.Success += s =>
             {
-                // For the time being, online ID responses are not really useful for anything.
-                // In addition, the IDs provided via new (lazer) endpoints are based on a different autoincrement from legacy (stable) scores.
-                //
-                // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
-                // conflicts across various systems (ie. solo and multiplayer).
-                // score.ScoreInfo.OnlineScoreID = s.ID;
+                score.ScoreInfo.OnlineScoreID = s.ID;
                 tcs.SetResult(true);
             };