RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split out a couple more nested classes

This commit is contained in:
Dean Herbert 2021-11-05 13:38:37 +09:00
parent ed07ee8c61
commit ead64282dd
6 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
View File

@ -82,7 +82,7 @@ public TestSceneRankGraph()
{
GlobalRank = 89000,
PP = 12345,
RankHistory = new APIUser.RankHistoryData
RankHistory = new APIRankHistory
{
Data = data,
}
@ -95,7 +95,7 @@ public TestSceneRankGraph()
{
GlobalRank = 89000,
PP = 12345,
RankHistory = new APIUser.RankHistoryData
RankHistory = new APIRankHistory
{
Data = dataWithZeros,
}
@ -108,7 +108,7 @@ public TestSceneRankGraph()
{
GlobalRank = 12000,
PP = 12345,
RankHistory = new APIUser.RankHistoryData
RankHistory = new APIRankHistory
{
Data = smallData,
}
@ -121,7 +121,7 @@ public TestSceneRankGraph()
{
GlobalRank = 12000,
PP = 12345,
RankHistory = new APIUser.RankHistoryData
RankHistory = new APIRankHistory
{
Data = edgyData,
}

4
osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
View File

@ -42,7 +42,7 @@ public class TestSceneUserProfileOverlay : OsuTestScene
Current = 727,
Progress = 69,
},
RankHistory = new APIUser.RankHistoryData
RankHistory = new APIRankHistory
{
Mode = @"osu",
Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
@ -59,7 +59,7 @@ public class TestSceneUserProfileOverlay : OsuTestScene
},
Title = "osu!volunteer",
Colour = "ff0000",
Achievements = Array.Empty<APIUser.UserAchievement>(),
Achievements = Array.Empty<APIUserAchievement>(),
};
public TestSceneUserProfileOverlay()

16
osu.Game/Online/API/Requests/Responses/APIRankHistory.cs Normal file
View File

@ -0,0 +1,16 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using Newtonsoft.Json;
namespace osu.Game.Online.API.Requests.Responses
{
public class APIRankHistory
{
[JsonProperty(@"mode")]
public string Mode;
[JsonProperty(@"data")]
public int[] Data;
}
}

22
osu.Game/Online/API/Requests/Responses/APIUser.cs
View File

@ -200,34 +200,16 @@ public UserStatistics Statistics
}
[JsonProperty(@"rank_history")]
private RankHistoryData rankHistory
private APIRankHistory rankHistory
{
set => statistics.RankHistory = value;
}
public class RankHistoryData
{
[JsonProperty(@"mode")]
public string Mode;
[JsonProperty(@"data")]
public int[] Data;
}
[JsonProperty("badges")]
public Badge[] Badges;
[JsonProperty("user_achievements")]
public UserAchievement[] Achievements;
public class UserAchievement
{
[JsonProperty("achieved_at")]
public DateTimeOffset AchievedAt;
[JsonProperty("achievement_id")]
public int ID;
}
public APIUserAchievement[] Achievements;
[JsonProperty("monthly_playcounts")]
public APIUserHistoryCount[] MonthlyPlaycounts;

17
osu.Game/Online/API/Requests/Responses/APIUserAchievement.cs Normal file
View File

@ -0,0 +1,17 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using Newtonsoft.Json;
namespace osu.Game.Online.API.Requests.Responses
{
public class APIUserAchievement
{
[JsonProperty("achievement_id")]
public int ID;
[JsonProperty("achieved_at")]
public DateTimeOffset AchievedAt;
}
}

3
osu.Game/Users/UserStatistics.cs
View File

@ -7,7 +7,6 @@
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Scoring;
using osu.Game.Utils;
using static osu.Game.Online.API.Requests.Responses.APIUser;
namespace osu.Game.Users
{
@ -35,7 +34,7 @@ public struct LevelInfo
public int? CountryRank;
// populated via User model, as that's where the data currently lives.
public RankHistoryData RankHistory;
public APIRankHistory RankHistory;
[JsonProperty(@"pp")]
public decimal? PP;