h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:02:57 +08:00
Code Issues Releases Wiki Activity

Handle query params better.

Browse Source
This commit is contained in:
naoey 2017-11-22 09:56:01 +05:30
parent 096e98b5d3
commit b6de1ce5b6
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
osu.Game/Online/API/Requests/GetScoresRequest.cs
View File

@ -12,6 +12,7 @@ using osu.Game.Rulesets.Replays;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Select.Leaderboards;
using System.Collections.Specialized;
using osu.Framework.IO.Network;
namespace osu.Game.Online.API.Requests
{
@ -31,7 +32,7 @@ namespace osu.Game.Online.API.Requests
Success += onSuccess;
}
public GetScoresRequest(BeatmapInfo beatmap, LeaderboardScope scope, RulesetInfo ruleset)
public GetScoresRequest(BeatmapInfo beatmap, RulesetInfo ruleset, LeaderboardScope scope = LeaderboardScope.Global)
{
if (!beatmap.OnlineBeatmapID.HasValue)
throw new InvalidOperationException($"Cannot lookup a beatmap's scores without having a populated {nameof(BeatmapInfo.OnlineBeatmapID)}.");
@ -49,46 +50,53 @@ namespace osu.Game.Online.API.Requests
score.ApplyBeatmap(beatmap);
}
private string mapScopeToQuery()
protected override WebRequest CreateWebRequest()
{
var req = base.CreateWebRequest();
switch(scope)
{
default:
case LeaderboardScope.Global:
return @"type=global";
req.AddParameter(@"type", @"global");
break;
case LeaderboardScope.Friends:
return @"type=friend";
req.AddParameter(@"type", @"friend");
break;
case LeaderboardScope.Country:
return @"type=country";
default:
return String.Empty;
req.AddParameter(@"type", @"country");
break;
}
}
private string mapRulesetToQuery()
{
switch(ruleset.Name)
if (ruleset != null)
{
case @"osu!":
return @"mode=osu";
switch (ruleset.Name)
{
default:
case @"osu!":
req.AddParameter(@"mode", @"osu");
break;
case @"osu!taiko":
return @"mode=taiko";
case @"osu!catch":
return @"mode=catch";
case @"osu!mania":
return @"mode=mania";
case @"osu!taiko":
req.AddParameter(@"mode", @"taiko");
break;
default:
return String.Empty;
case @"osu!catch":
req.AddParameter(@"mode", @"catch");
break;
case @"osu!mania":
req.AddParameter(@"mode", @"mania");
break;
}
}
return req;
}
protected override string Target => $@"beatmaps/{beatmap.OnlineBeatmapID}/scores?{mapScopeToQuery()}&{mapRulesetToQuery()}";
protected override string Target => $@"beatmaps/{beatmap.OnlineBeatmapID}/scores";
}
public class GetScoresResponse

2
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -193,7 +193,7 @@ namespace osu.Game.Screens.Select.Leaderboards
loading.Show();
getScoresRequest = new GetScoresRequest(Beatmap, Scope, osuGame.Ruleset.Value);
getScoresRequest = new GetScoresRequest(Beatmap, osuGame.Ruleset.Value, Scope);
getScoresRequest.Success += r =>
{
Scores = r.Scores;