sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Private_Messages

Browse Source 
# Conflicts:
#	osu.Game/Online/API/Requests/GetMessagesRequest.cs
#	osu.Game/Overlays/Chat/ChatTabControl.cs
This commit is contained in:
miterosan
2018-05-06 19:45:33 +02:00
parent 3b68dda23e 420e50b6da
commit ba5861b527
94 changed files with 999 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
View File

@ -5,13 +5,21 @@ namespace osu.Game.Online.API.Requests
{
public class GetBeatmapSetRequest : APIRequest<APIResponseBeatmapSet>
{
private readonly int beatmapSetId;
private readonly int id;
private readonly BeatmapSetLookupType type;
public GetBeatmapSetRequest(int beatmapSetId)
public GetBeatmapSetRequest(int id, BeatmapSetLookupType type = BeatmapSetLookupType.SetId)
{
this.beatmapSetId = beatmapSetId;
this.id = id;
this.type = type;
}
protected override string Target => $@"beatmapsets/{beatmapSetId}";
protected override string Target => type == BeatmapSetLookupType.SetId ? $@"beatmapsets/{id}" : $@"beatmapsets/lookup?beatmap_id={id}";
}
public enum BeatmapSetLookupType
{
SetId,
BeatmapId,
}
}

2
osu.Game/Online/API/Requests/GetUserRequest.cs
View File

@ -7,7 +7,7 @@ namespace osu.Game.Online.API.Requests
{
public class GetUserRequest : APIRequest<User>
{
private long? userId;
private readonly long? userId;
public GetUserRequest(long? userId = null)
{