From d3030831793dc68f7d8e04fce2d05209e6fab796 Mon Sep 17 00:00:00 2001
From: StanR <hi@stanr.info>
Date: Thu, 29 Aug 2019 12:29:31 +0300
Subject: [PATCH] Update to match api

---
 .../Online/TestSceneBeatmapSetOverlay.cs      |  4 +-
 osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs     | 51 +++----------------
 .../API/Requests/Responses/APIBeatmapSet.cs   |  4 +-
 osu.Game/Overlays/BeatmapSet/Info.cs          |  4 +-
 4 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 2d918442eb..ee9e088dcc 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -176,8 +176,8 @@ namespace osu.Game.Tests.Visual.Online
                         HasVideo = true,
                         HasStoryboard = true,
                         Covers = new BeatmapSetOnlineCovers(),
-                        Language = BeatmapSetOnlineLanguage.English,
-                        Genre = BeatmapSetOnlineGenre.Rock,
+                        Language = new BeatmapSetOnlineLanguage { Id = 3, Name = "English" },
+                        Genre = new BeatmapSetOnlineGenre { Id = 4, Name = "Rock" },
                     },
                     Metrics = new BeatmapSetMetrics { Ratings = Enumerable.Range(0, 11).ToArray() },
                     Beatmaps = new List<BeatmapInfo>
diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
index decf2d10db..500e42096c 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
@@ -88,55 +88,16 @@ namespace osu.Game.Beatmaps
         public BeatmapSetOnlineLanguage Language { get; set; }
     }
 
-    public enum BeatmapSetOnlineGenre
+    public class BeatmapSetOnlineGenre
     {
-        [Description("Any")]
-        Any = 0,
-
-        [Description("Unspecified")]
-        Unspecified = 1,
-
-        [Description("Video Game")]
-        VideoGame = 2,
-
-        [Description("Anime")]
-        Anime = 3,
-
-        [Description("Rock")]
-        Rock = 4,
-
-        [Description("Pop")]
-        Pop = 5,
-
-        [Description("Other")]
-        Other = 6,
-
-        [Description("Novelty")]
-        Novelty = 7,
-
-        // genre_id 8 doesn't exist
-
-        [Description("Hip-Hop")]
-        HipHop = 9,
-
-        [Description("Electronic")]
-        Electronic = 10
+        public int Id { get; set; }
+        public string Name { get; set; }
     }
 
-    public enum BeatmapSetOnlineLanguage
+    public class BeatmapSetOnlineLanguage
     {
-        Any,
-        Other,
-        English,
-        Japanese,
-        Chinese,
-        Instrumental,
-        Korean,
-        French,
-        German,
-        Swedish,
-        Spanish,
-        Italian
+        public int Id { get; set; }
+        public string Name { get; set; }
     }
 
     public class BeatmapSetOnlineCovers
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index 1526cccf31..1ca14256e5 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -69,10 +69,10 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"availability")]
         private BeatmapSetOnlineAvailability availability { get; set; }
 
-        [JsonProperty(@"genre_id")]
+        [JsonProperty(@"genre")]
         private BeatmapSetOnlineGenre genre { get; set; }
 
-        [JsonProperty(@"language_id")]
+        [JsonProperty(@"language")]
         private BeatmapSetOnlineLanguage language { get; set; }
 
         [JsonProperty(@"beatmaps")]
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 0e4e9db948..9c5cce89f9 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -133,8 +133,8 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 source.Text = b.NewValue?.Metadata.Source ?? string.Empty;
                 tags.Text = b.NewValue?.Metadata.Tags ?? string.Empty;
-                genre.Text = (b.NewValue?.OnlineInfo.Genre ?? BeatmapSetOnlineGenre.Unspecified).GetDescription();
-                language.Text = (b.NewValue?.OnlineInfo.Language ?? BeatmapSetOnlineLanguage.Other).ToString();
+                genre.Text = b.NewValue?.OnlineInfo.Genre.Name ?? "Unspecified";
+                language.Text = b.NewValue?.OnlineInfo.Language.Name ?? "Other";
             };
         }