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

Merge pull request #1267 from peppy/user-profile-api-update 

Update profiles to support newer return structure from osu-web API
This commit is contained in:
Dean Herbert 2017-09-14 19:10:12 +09:00 committed by GitHub
parent 6e0e198098 bf2d1debdb
commit 9adf38d5e1
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Desktop.Tests/Visual/TestCaseUserProfile.cs
View File

@ -33,13 +33,10 @@ public TestCaseUserProfile()
Rank = 2148,
PP = 4567.89m
},
AllRankHistories = new User.RankHistories
RankHistory = new User.RankHistoryData
{
Osu = new User.RankHistory
{
Mode = @"osu",
Data = Enumerable.Range(2345,45).Concat(Enumerable.Range(2109,40)).ToArray()
}
Mode = @"osu",
Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
}
}, false));
AddStep("Show ppy", () => profile.ShowUser(new User

2
osu.Game/Overlays/Profile/RankChart.cs
View File

@ -70,7 +70,7 @@ public RankChart(User user)
}
};
ranks = user.AllRankHistories?.Osu?.Data ?? new[] { user.Statistics.Rank };
ranks = user.RankHistory?.Data ?? new[] { user.Statistics.Rank };
}
private void updateRankTexts()

23
osu.Game/Users/User.cs
View File

@ -122,25 +122,10 @@ public class KudosuCount
public int Available;
}
[JsonProperty(@"defaultStatistics")]
[JsonProperty(@"statistics")]
public UserStatistics Statistics;
public class RankHistories
{
[JsonProperty(@"osu")]
public RankHistory Osu;
[JsonProperty(@"taiko")]
public RankHistory Taiko;
[JsonProperty(@"fruits")]
public RankHistory Fruits;
[JsonProperty(@"mania")]
public RankHistory Mania;
}
public class RankHistory
public class RankHistoryData
{
[JsonProperty(@"mode")]
public string Mode;
@ -149,7 +134,7 @@ public class RankHistory
public int[] Data;
}
[JsonProperty(@"allRankHistories")]
public RankHistories AllRankHistories;
[JsonProperty(@"rankHistory")]
public RankHistoryData RankHistory;
}
}