From c834aa605103b95cd9e074b6bd55ac4861694181 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Oct 2020 17:38:16 +0900
Subject: [PATCH] Use APIMod for mod serialization

---
 osu.Game/Online/API/APIMod.cs                         |  8 ++++++++
 osu.Game/Online/Spectator/SpectatorState.cs           | 11 ++++-------
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 46a8db31b7..780e5daa16 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -53,5 +53,13 @@ namespace osu.Game.Online.API
         }
 
         public bool Equals(IMod other) => Acronym == other?.Acronym;
+
+        public override string ToString()
+        {
+            if (Settings.Count > 0)
+                return $"{Acronym} ({string.Join(',', Settings.Select(kvp => $"{kvp.Key}:{kvp.Value}"))})";
+
+            return $"{Acronym}";
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 90238bfc38..3d9997f006 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.Spectator
@@ -12,21 +13,17 @@ namespace osu.Game.Online.Spectator
         public int? BeatmapID { get; set; }
 
         [NotNull]
-        public IEnumerable<Mod> Mods { get; set; } = Enumerable.Empty<Mod>();
+        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public SpectatorState(int? beatmapId = null, IEnumerable<Mod> mods = null)
+        public SpectatorState(int? beatmapId = null, IEnumerable<APIMod> mods = null)
         {
             BeatmapID = beatmapId;
             if (mods != null)
                 Mods = mods;
         }
 
-        public SpectatorState()
-        {
-        }
-
         public bool Equals(SpectatorState other) => this.BeatmapID == other?.BeatmapID && this.Mods.SequenceEqual(other?.Mods);
 
-        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods.SelectMany(m => m.Acronym))}";
+        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)}";
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index a89cc82535..21259bad5f 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Online.Spectator
 
             // transfer state at point of beginning play
             currentState.BeatmapID = beatmap.Value.BeatmapInfo.OnlineBeatmapID;
-            currentState.Mods = mods.Value.ToArray();
+            currentState.Mods = mods.Value.Select(m => new APIMod(m));
 
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }