Merge remote-tracking branch 'upstream/master'

dragonfruitnetwork · Sep 10, 2021 · e701864 · e701864
2 parents b798022 + 7d9d374
commit e701864
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/User/Entities/OsuUser.cs b/src/User/Entities/OsuUser.cs
@@ -99,7 +99,10 @@ public override int? CurrentModeRank
         [JsonProperty("loved_beatmapset_count")]
         public uint LovedMapsetCount { get; set; }
 
-        [JsonProperty("ranked_and_approved_beatmapset_count")]
+        [JsonProperty("pending_beatmapset_count")]
+        public uint PendingMapsetCount { get; set; }
+
+        [JsonProperty("ranked_beatmapset_count")]
         public uint RankedMapsetCount { get; set; }
 
         [JsonProperty("follower_count")]
@@ -179,24 +182,24 @@ public IEnumerable<string> PlaystyleNames
         }
 
         [JsonProperty("profile_order")]
-        public IEnumerable<string> ProfileOrder { get; set; }
+        public string[] ProfileOrder { get; set; }
 
         [CanBeNull]
         [JsonProperty("badges")]
-        public IEnumerable<OsuUserBadge> Badges { get; set; }
+        public OsuUserBadge[] Badges { get; set; }
 
         [JsonProperty("user_achievements")]
-        public IEnumerable<OsuUserAchievement> Achievements { get; set; }
+        public OsuUserAchievement[] Achievements { get; set; }
 
         [CanBeNull]
         [JsonProperty("previous_usernames")]
-        public IEnumerable<string> PreviousNames { get; set; }
+        public string[] PreviousNames { get; set; }
 
         [CanBeNull]
         [JsonProperty("replays_watched_counts")]
-        public IEnumerable<OsuStatisticsPeriod<uint>> ReplayWatchCounts { get; set; }
+        public OsuStatisticsPeriod<uint>[] ReplayWatchCounts { get; set; }
 
         [JsonProperty("monthly_playcounts")]
-        public IEnumerable<OsuStatisticsPeriod<uint>> PlayCounts { get; set; }
+        public OsuStatisticsPeriod<uint>[] PlayCounts { get; set; }
     }
 }
diff --git a/src/User/Enums/UserBeatmapType.cs b/src/User/Enums/UserBeatmapType.cs
@@ -1,16 +1,18 @@
 // Orbit API Copyright (C) 2019-2021 DragonFruit Network
 // Licensed under the MIT License - see the LICENSE file at the root of the project for more info
 
+using System;
 using System.ComponentModel;
 using DragonFruit.Orbit.Api.Utils;
 
 namespace DragonFruit.Orbit.Api.User.Enums
 {
     public enum UserBeatmapType
     {
-        Favourite,
         Loved,
-        Unranked,
+        Ranked,
+        Pending,
+        Favourite,
 
         [ExternalValue("graveyard")]
         Graveyarded,
@@ -19,8 +21,12 @@ public enum UserBeatmapType
         [ExternalValue("most_played")]
         MostPlayed,
 
+        [Obsolete("Depreciated osu-side. Use Pending instead")]
+        Unranked,
+
         [Description("Ranked and Approved")]
         [ExternalValue("ranked_and_approved")]
+        [Obsolete("Depreciated osu-side. Use Ranked instead")]
         RankedAndApproved,
     }
 }