sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Replace Ranks.Global completely with a GlobalRank property

Browse Source
This commit is contained in:
Salman Ahmed
2021-02-17 08:50:48 +03:00
parent d7c91a7c6f
commit a845e96b7a
12 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop/DiscordRichPresence.cs
View File

@ -105,7 +105,7 @@ namespace osu.Desktop
if (privacyMode.Value == DiscordRichPresenceMode.Limited) if (privacyMode.Value == DiscordRichPresenceMode.Limited)
presence.Assets.LargeImageText = string.Empty; presence.Assets.LargeImageText = string.Empty;
else else
presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty); presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
// update ruleset // update ruleset
presence.Assets.SmallImageKey = ruleset.Value.ID <= 3 ? $"mode_{ruleset.Value.ID}" : "mode_custom"; presence.Assets.SmallImageKey = ruleset.Value.ID <= 3 ? $"mode_{ruleset.Value.ID}" : "mode_custom";

10
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
View File

@ -160,10 +160,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
{ {
Ruleset.Value.ShortName, Ruleset.Value.ShortName,
new UserStatistics new UserStatistics { GlobalRank = RNG.Next(1, 100000), }
{
Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
}
} }
}, },
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
@ -207,10 +204,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
{ {
Ruleset.Value.ShortName, Ruleset.Value.ShortName,
new UserStatistics new UserStatistics { GlobalRank = RNG.Next(1, 100000), }
{
Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
}
} }
}, },
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",

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

@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
graph.Statistics.Value = new UserStatistics graph.Statistics.Value = new UserStatistics
{ {
Ranks = new UserStatistics.UserRanks { Global = 123456 }, GlobalRank = 123456,
PP = 12345, PP = 12345,
}; };
}); });
@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
graph.Statistics.Value = new UserStatistics graph.Statistics.Value = new UserStatistics
{ {
Ranks = new UserStatistics.UserRanks { Global = 89000 }, GlobalRank = 89000,
PP = 12345, PP = 12345,
RankHistory = new User.RankHistoryData RankHistory = new User.RankHistoryData
{ {
@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
graph.Statistics.Value = new UserStatistics graph.Statistics.Value = new UserStatistics
{ {
Ranks = new UserStatistics.UserRanks { Global = 89000 }, GlobalRank = 89000,
PP = 12345, PP = 12345,
RankHistory = new User.RankHistoryData RankHistory = new User.RankHistoryData
{ {
@ -105,7 +105,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
graph.Statistics.Value = new UserStatistics graph.Statistics.Value = new UserStatistics
{ {
Ranks = new UserStatistics.UserRanks { Global = 12000 }, GlobalRank = 12000,
PP = 12345, PP = 12345,
RankHistory = new User.RankHistoryData RankHistory = new User.RankHistoryData
{ {
@ -118,7 +118,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
graph.Statistics.Value = new UserStatistics graph.Statistics.Value = new UserStatistics
{ {
Ranks = new UserStatistics.UserRanks { Global = 12000 }, GlobalRank = 12000,
PP = 12345, PP = 12345,
RankHistory = new User.RankHistoryData RankHistory = new User.RankHistoryData
{ {

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

@ -33,7 +33,8 @@ namespace osu.Game.Tests.Visual.Online
ProfileOrder = new[] { "me" }, ProfileOrder = new[] { "me" },
Statistics = new UserStatistics Statistics = new UserStatistics
{ {
Ranks = new UserStatistics.UserRanks { Global = 2148, Country = 1 }, GlobalRank = 2148,
Ranks = new UserStatistics.UserRanks { Country = 1, },
PP = 4567.89m, PP = 4567.89m,
Level = new UserStatistics.LevelInfo Level = new UserStatistics.LevelInfo
{ {

10
osu.Game.Tournament.Tests/TournamentTestScene.cs
View File

@ -113,11 +113,11 @@ namespace osu.Game.Tournament.Tests
}, },
Players = Players =
{ {
new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 12 } } }, new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 12 } },
new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 16 } } }, new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 16 } },
new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 20 } } }, new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 20 } },
new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 24 } } }, new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 24 } },
new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 30 } } }, new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 30 } },
} }
} }
}, },

2
osu.Game.Tournament/Models/TournamentTeam.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Models
{ {
get get
{ {
var ranks = Players.Select(p => p.Statistics?.Ranks.Global) var ranks = Players.Select(p => p.Statistics?.GlobalRank)
.Where(i => i.HasValue) .Where(i => i.HasValue)
.Select(i => i.Value) .Select(i => i.Value)
.ToArray(); .ToArray();

2
osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
View File

@ -250,7 +250,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
}; };
foreach (var p in team.Players) foreach (var p in team.Players)
fill.Add(new RowDisplay(p.Username, p.Statistics?.Ranks.Global?.ToString("\\##,0") ?? "-")); fill.Add(new RowDisplay(p.Username, p.Statistics?.GlobalRank?.ToString("\\##,0") ?? "-"));
} }
internal class RowDisplay : CompositeDrawable internal class RowDisplay : CompositeDrawable

2
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -150,7 +150,7 @@ namespace osu.Game.Tournament
{ {
foreach (var p in t.Players) foreach (var p in t.Players)
{ {
if (string.IsNullOrEmpty(p.Username) || p.Statistics == null) if (string.IsNullOrEmpty(p.Username) || p.Statistics?.GlobalRank == null)
{ {
PopulateUser(p, immediate: true); PopulateUser(p, immediate: true);
addedInfo = true; addedInfo = true;

2
osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
View File

@ -144,7 +144,7 @@ namespace osu.Game.Overlays.Profile.Header
private void updateDisplay(User user) private void updateDisplay(User user)
{ {
hiddenDetailGlobal.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-"; hiddenDetailGlobal.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
hiddenDetailCountry.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-"; hiddenDetailCountry.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
} }
} }

2
osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
View File

@ -176,7 +176,7 @@ namespace osu.Game.Overlays.Profile.Header
foreach (var scoreRankInfo in scoreRankInfos) foreach (var scoreRankInfo in scoreRankInfos)
scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0; scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-"; detailGlobalRank.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-"; detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
rankGraph.Statistics.Value = user?.Statistics; rankGraph.Statistics.Value = user?.Statistics;

2
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
View File

@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID); var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.Ranks.Global; var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty; userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability); userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);

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

@ -26,17 +26,14 @@ namespace osu.Game.Users
public int Progress; public int Progress;
} }
[JsonProperty(@"global_rank")]
public int? GlobalRank;
// eventually UserRanks object will be completely replaced with separate global rank (exists) and country rank properties
// see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
[JsonProperty(@"rank")] [JsonProperty(@"rank")]
public UserRanks Ranks; public UserRanks Ranks;
// eventually UserRanks object will be completely replaced with separate global and country rank properties, see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
// but for now, always point UserRanks.Global to the global_rank property, as that is included solely for requests like GetUsersRequest.
[JsonProperty(@"global_rank")]
private int? globalRank
{
set => Ranks.Global = value;
}
[JsonProperty(@"pp")] [JsonProperty(@"pp")]
public decimal? PP; public decimal? PP;
@ -120,9 +117,6 @@ namespace osu.Game.Users
public struct UserRanks public struct UserRanks
{ {
[JsonProperty(@"global")]
public int? Global;
[JsonProperty(@"country")] [JsonProperty(@"country")]
public int? Country; public int? Country;
} }