From 2c70ddc64278e0c8f2cac2fe55c38d6efc31e16d Mon Sep 17 00:00:00 2001 From: Albie Date: Wed, 9 Jun 2021 11:35:23 +0100 Subject: [PATCH 1/3] depreciate/rename some enum members relating to user maps --- src/User/Entities/OsuUser.cs | 17 ++++++++++------- src/User/Enums/UserBeatmapType.cs | 9 +++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/User/Entities/OsuUser.cs b/src/User/Entities/OsuUser.cs index 21e0a24..09047ea 100644 --- 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 PlaystyleNames } [JsonProperty("profile_order")] - public IEnumerable ProfileOrder { get; set; } + public string[] ProfileOrder { get; set; } [CanBeNull] [JsonProperty("badges")] - public IEnumerable Badges { get; set; } + public OsuUserBadge[] Badges { get; set; } [JsonProperty("user_achievements")] - public IEnumerable Achievements { get; set; } + public OsuUserAchievement[] Achievements { get; set; } [CanBeNull] [JsonProperty("previous_usernames")] - public IEnumerable PreviousNames { get; set; } + public string[] PreviousNames { get; set; } [CanBeNull] [JsonProperty("replays_watched_counts")] - public IEnumerable> ReplayWatchCounts { get; set; } + public OsuStatisticsPeriod[] ReplayWatchCounts { get; set; } [JsonProperty("monthly_playcounts")] - public IEnumerable> PlayCounts { get; set; } + public OsuStatisticsPeriod[] PlayCounts { get; set; } } } diff --git a/src/User/Enums/UserBeatmapType.cs b/src/User/Enums/UserBeatmapType.cs index aa7151e..7ca51d6 100644 --- a/src/User/Enums/UserBeatmapType.cs +++ b/src/User/Enums/UserBeatmapType.cs @@ -1,6 +1,7 @@ // 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; @@ -8,9 +9,9 @@ namespace DragonFruit.Orbit.Api.User.Enums { public enum UserBeatmapType { + Ranked, + Pending, Favourite, - Loved, - Unranked, [ExternalValue("graveyard")] Graveyarded, @@ -19,8 +20,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, } } From 5bce5be70fc6e3332cf468fa6b560249c94f653f Mon Sep 17 00:00:00 2001 From: Albie Date: Tue, 15 Jun 2021 17:11:29 +0100 Subject: [PATCH 2/3] re-add loved --- src/User/Enums/UserBeatmapType.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/User/Enums/UserBeatmapType.cs b/src/User/Enums/UserBeatmapType.cs index 7ca51d6..0583bd2 100644 --- a/src/User/Enums/UserBeatmapType.cs +++ b/src/User/Enums/UserBeatmapType.cs @@ -9,6 +9,7 @@ namespace DragonFruit.Orbit.Api.User.Enums { public enum UserBeatmapType { + Loved, Ranked, Pending, Favourite, From 97ed6967cfab3f12f7577b746f512ba3e8e72f8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 06:10:10 +0000 Subject: [PATCH 3/3] Bump Microsoft.NET.Test.Sdk from 16.10.0 to 16.11.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.10.0 to 16.11.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tests/DragonFruit.Orbit.Api.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/DragonFruit.Orbit.Api.Tests.csproj b/tests/DragonFruit.Orbit.Api.Tests.csproj index d6ab43b..4cc1b1d 100644 --- a/tests/DragonFruit.Orbit.Api.Tests.csproj +++ b/tests/DragonFruit.Orbit.Api.Tests.csproj @@ -9,7 +9,7 @@ - +