h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 22:03:21 +08:00
Code Issues Releases Wiki Activity

Send password in request ctor directly

Browse Source
This commit is contained in:
Dean Herbert 2021-07-13 14:27:07 +09:00
parent 35b5f0462c
commit 125bd36ab1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Online/Rooms/JoinRoomRequest.cs
View File

@ -10,19 +10,22 @@ namespace osu.Game.Online.Rooms
public class JoinRoomRequest : APIRequest public class JoinRoomRequest : APIRequest
{ {
private readonly Room room; private readonly Room room;
private readonly string password;
public JoinRoomRequest(Room room) public JoinRoomRequest(Room room, string password)
{ {
this.room = room; this.room = room;
this.password = password;
} }
protected override WebRequest CreateWebRequest() protected override WebRequest CreateWebRequest()
{ {
var req = base.CreateWebRequest(); var req = base.CreateWebRequest();
req.Method = HttpMethod.Put; req.Method = HttpMethod.Put;
req.AddParameter("password", password);
return req; return req;
} }
protected override string Target => $"rooms/{room.RoomID.Value}/users/{User.Id}?password={room.Password.Value}"; protected override string Target => $"rooms/{room.RoomID.Value}/users/{User.Id}";
} }
} }

5
osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
View File

@ -86,11 +86,8 @@ namespace osu.Game.Screens.OnlinePlay.Components
public virtual void JoinRoom(Room room, string password = null, Action<Room> onSuccess = null, Action<string> onError = null) public virtual void JoinRoom(Room room, string password = null, Action<Room> onSuccess = null, Action<string> onError = null)
{ {
// todo: send into JoinRoomRequest directly?
room.Password.Value = password;
currentJoinRoomRequest?.Cancel(); currentJoinRoomRequest?.Cancel();
currentJoinRoomRequest = new JoinRoomRequest(room); currentJoinRoomRequest = new JoinRoomRequest(room, password);
currentJoinRoomRequest.Success += () => currentJoinRoomRequest.Success += () =>
{ {