From 0f6735564eeefca5ea9ef14dd85771da117b3366 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 7 Jan 2023 10:54:48 -0800
Subject: [PATCH] Move and rename nomination response model to singular

---
 .../BeatmapSetOnlineNomination.cs}                       | 4 ++--
 osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs  | 2 +-
 osu.Game/Overlays/BeatmapSet/Info.cs                     | 2 +-
 .../Overlays/BeatmapSet/MetadataSectionNominators.cs     | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename osu.Game/{Online/API/Requests/Responses/BeatmapSetOnlineNominations.cs => Beatmaps/BeatmapSetOnlineNomination.cs} (84%)

diff --git a/osu.Game/Online/API/Requests/Responses/BeatmapSetOnlineNominations.cs b/osu.Game/Beatmaps/BeatmapSetOnlineNomination.cs
similarity index 84%
rename from osu.Game/Online/API/Requests/Responses/BeatmapSetOnlineNominations.cs
rename to osu.Game/Beatmaps/BeatmapSetOnlineNomination.cs
index 5d0a3ea38b..f6de414628 100644
--- a/osu.Game/Online/API/Requests/Responses/BeatmapSetOnlineNominations.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineNomination.cs
@@ -3,9 +3,9 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.API.Requests.Responses
+namespace osu.Game.Beatmaps
 {
-    public struct BeatmapSetOnlineNominations
+    public struct BeatmapSetOnlineNomination
     {
         [JsonProperty(@"beatmapset_id")]
         public int BeatmapsetId { get; set; }
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index eb39b7489d..fc740f1eec 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public BeatmapSetOnlineLanguage Language { get; set; }
 
         [JsonProperty(@"current_nominations")]
-        public BeatmapSetOnlineNominations[] CurrentNominations { get; set; } = Array.Empty<BeatmapSetOnlineNominations>();
+        public BeatmapSetOnlineNomination[] CurrentNominations { get; set; } = Array.Empty<BeatmapSetOnlineNomination>();
 
         [JsonProperty(@"related_users")]
         public APIUser[] RelatedUsers { get; set; } = Array.Empty<APIUser>();
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index dbeea74f6f..58739eb471 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
             BeatmapSet.ValueChanged += b =>
             {
-                nominators.Metadata = (b.NewValue?.CurrentNominations ?? Array.Empty<BeatmapSetOnlineNominations>(), b.NewValue?.RelatedUsers ?? Array.Empty<APIUser>());
+                nominators.Metadata = (b.NewValue?.CurrentNominations ?? Array.Empty<BeatmapSetOnlineNomination>(), b.NewValue?.RelatedUsers ?? Array.Empty<APIUser>());
                 source.Metadata = b.NewValue?.Source ?? string.Empty;
                 tags.Metadata = b.NewValue?.Tags ?? string.Empty;
                 genre.Metadata = b.NewValue?.Genre ?? new BeatmapSetOnlineGenre { Id = (int)SearchGenre.Unspecified };
diff --git a/osu.Game/Overlays/BeatmapSet/MetadataSectionNominators.cs b/osu.Game/Overlays/BeatmapSet/MetadataSectionNominators.cs
index 78a3fe7cd5..76dbda3d5e 100644
--- a/osu.Game/Overlays/BeatmapSet/MetadataSectionNominators.cs
+++ b/osu.Game/Overlays/BeatmapSet/MetadataSectionNominators.cs
@@ -4,15 +4,16 @@
 using System;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public partial class MetadataSectionNominators : MetadataSection<(BeatmapSetOnlineNominations[] CurrentNominations, APIUser[] RelatedUsers)>
+    public partial class MetadataSectionNominators : MetadataSection<(BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers)>
     {
-        public override (BeatmapSetOnlineNominations[] CurrentNominations, APIUser[] RelatedUsers) Metadata
+        public override (BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers) Metadata
         {
             set
             {
@@ -26,12 +27,12 @@ namespace osu.Game.Overlays.BeatmapSet
             }
         }
 
-        public MetadataSectionNominators(Action<(BeatmapSetOnlineNominations[] CurrentNominations, APIUser[] RelatedUsers)>? searchAction = null)
+        public MetadataSectionNominators(Action<(BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers)>? searchAction = null)
             : base(MetadataType.Nominators, searchAction)
         {
         }
 
-        protected override void AddMetadata((BeatmapSetOnlineNominations[] CurrentNominations, APIUser[] RelatedUsers) metadata, LinkFlowContainer loaded)
+        protected override void AddMetadata((BeatmapSetOnlineNomination[] CurrentNominations, APIUser[] RelatedUsers) metadata, LinkFlowContainer loaded)
         {
             int[] nominatorIds = metadata.CurrentNominations.Select(n => n.UserId).ToArray();