sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-19 12:37:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary constructure and make ruleset required

Browse Source
This commit is contained in:
Dean Herbert 2017-12-20 20:41:01 +09:00
parent 1b91f24044
commit c871a25dfa
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,16 +21,6 @@ namespace osu.Game.Online.API.Requests
private readonly LeaderboardScope scope; private readonly LeaderboardScope scope;
private readonly RulesetInfo ruleset; private readonly RulesetInfo ruleset;
public GetScoresRequest(BeatmapInfo beatmap)
{
if (!beatmap.OnlineBeatmapID.HasValue)
throw new InvalidOperationException($"Cannot lookup a beatmap's scores without having a populated {nameof(BeatmapInfo.OnlineBeatmapID)}.");
this.beatmap = beatmap;
Success += onSuccess;
}
public GetScoresRequest(BeatmapInfo beatmap, RulesetInfo ruleset, LeaderboardScope scope = LeaderboardScope.Global) public GetScoresRequest(BeatmapInfo beatmap, RulesetInfo ruleset, LeaderboardScope scope = LeaderboardScope.Global)
{ {
if (!beatmap.OnlineBeatmapID.HasValue) if (!beatmap.OnlineBeatmapID.HasValue)
@ -41,7 +31,7 @@ namespace osu.Game.Online.API.Requests
this.beatmap = beatmap; this.beatmap = beatmap;
this.scope = scope; this.scope = scope;
this.ruleset = ruleset; this.ruleset = ruleset ?? throw new ArgumentNullException(nameof(ruleset));
Success += onSuccess; Success += onSuccess;
} }
@ -57,7 +47,7 @@ namespace osu.Game.Online.API.Requests
var req = base.CreateWebRequest(); var req = base.CreateWebRequest();
req.AddParameter(@"type", scope.ToString().ToLowerInvariant()); req.AddParameter(@"type", scope.ToString().ToLowerInvariant());
req.AddParameter(@"mode", ruleset?.ShortName ?? @"osu"); req.AddParameter(@"mode", ruleset.ShortName);
return req; return req;
} }

2
osu.Game/Tests/Visual/TestCasePerformancePoints.cs
View File

@ -244,7 +244,7 @@ namespace osu.Game.Tests.Visual
if (!api.IsLoggedIn) if (!api.IsLoggedIn)
return; return;
lastRequest = new GetScoresRequest(newBeatmap.BeatmapInfo); lastRequest = new GetScoresRequest(newBeatmap.BeatmapInfo, newBeatmap.BeatmapInfo.Ruleset);
lastRequest.Success += res => res.Scores.ForEach(s => scores.Add(new PerformanceDisplay(s, newBeatmap.Beatmap))); lastRequest.Success += res => res.Scores.ForEach(s => scores.Add(new PerformanceDisplay(s, newBeatmap.Beatmap)));
api.Queue(lastRequest); api.Queue(lastRequest);
} }