From c61419dfe5606b2749381b9a7eae275d4762e4bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jan 2022 16:56:09 +0900
Subject: [PATCH] Fix scores not using correct filename/display strings

I've updated all cases where we should have been using
`GetDisplayString()` anyway, but left the `ToString()` implementations
in place for safety. They should probably be removed in the future.
---
 osu.Game/Database/LegacyExporter.cs          | 2 +-
 osu.Game/Scoring/ScoreInfo.cs                | 2 ++
 osu.Game/Stores/RealmArchiveModelImporter.cs | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/LegacyExporter.cs b/osu.Game/Database/LegacyExporter.cs
index 802ccec6ed..ee960b6b30 100644
--- a/osu.Game/Database/LegacyExporter.cs
+++ b/osu.Game/Database/LegacyExporter.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Database
         /// <param name="item">The item to export.</param>
         public void Export(TModel item)
         {
-            string filename = $"{item.ToString().GetValidArchiveContentFilename()}{FileExtension}";
+            string filename = $"{item.GetDisplayString().GetValidArchiveContentFilename()}{FileExtension}";
 
             using (var stream = exportStorage.GetStream(filename, FileAccess.Write, FileMode.Create))
                 ExportModelTo(item, stream);
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index a10039bc72..9b4f4bf784 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -274,5 +274,7 @@ namespace osu.Game.Scoring
         }
 
         #endregion
+
+        public override string ToString() => this.GetDisplayTitle();
     }
 }
diff --git a/osu.Game/Stores/RealmArchiveModelImporter.cs b/osu.Game/Stores/RealmArchiveModelImporter.cs
index bcae9f2451..2ea7aecc94 100644
--- a/osu.Game/Stores/RealmArchiveModelImporter.cs
+++ b/osu.Game/Stores/RealmArchiveModelImporter.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Stores
             else
             {
                 notification.CompletionText = imported.Count == 1
-                    ? $"Imported {imported.First()}!"
+                    ? $"Imported {imported.First().GetDisplayString()}!"
                     : $"Imported {imported.Count} {HumanisedModelName}s!";
 
                 if (imported.Count > 0 && PostImport != null)