h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 06:42:54 +08:00
Code Issues Releases Wiki Activity

Apply NRT to APIRequest

Browse Source
This commit is contained in:
Dean Herbert 2024-08-30 18:21:30 +09:00
parent dd7133657d
commit 2d745fb67e
No known key found for this signature in database
7 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Online/API/APIRequest.cs
View File

@ -1,12 +1,9 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
#nullable disable
using System;
using System.Diagnostics;
using System.Globalization;
using JetBrains.Annotations;
using Newtonsoft.Json;
using osu.Framework.Extensions.TypeExtensions;
using osu.Framework.IO.Network;
@ -27,18 +24,17 @@ namespace osu.Game.Online.API
/// <summary>
/// The deserialised response object. May be null if the request or deserialisation failed.
/// </summary>
[CanBeNull]
public T Response { get; private set; }
public T? Response { get; private set; }
/// <summary>
/// Invoked on successful completion of an API request.
/// This will be scheduled to the API's internal scheduler (run on update thread automatically).
/// </summary>
public new event APISuccessHandler<T> Success;
public new event APISuccessHandler<T>? Success;
protected APIRequest()
{
base.Success += () => Success?.Invoke(Response);
base.Success += () => Success?.Invoke(Response!);
}
protected override void PostProcess()
@ -72,28 +68,28 @@ namespace osu.Game.Online.API
protected virtual WebRequest CreateWebRequest() => new OsuWebRequest(Uri);
protected virtual string Uri => $@"{API.APIEndpointUrl}/api/v2/{Target}";
protected virtual string Uri => $@"{API!.APIEndpointUrl}/api/v2/{Target}";
protected IAPIProvider API;
protected IAPIProvider? API;
protected WebRequest WebRequest;
protected WebRequest? WebRequest;
/// <summary>
/// The currently logged in user. Note that this will only be populated during <see cref="Perform"/>.
/// </summary>
protected APIUser User { get; private set; }
protected APIUser? User { get; private set; }
/// <summary>
/// Invoked on successful completion of an API request.
/// This will be scheduled to the API's internal scheduler (run on update thread automatically).
/// </summary>
public event APISuccessHandler Success;
public event APISuccessHandler? Success;
/// <summary>
/// Invoked on failure to complete an API request.
/// This will be scheduled to the API's internal scheduler (run on update thread automatically).
/// </summary>
public event APIFailureHandler Failure;
public event APIFailureHandler? Failure;
private readonly object completionStateLock = new object();
@ -210,7 +206,7 @@ namespace osu.Game.Online.API
// in the case of a cancellation we don't care about whether there's an error in the response.
if (!(e is OperationCanceledException))
{
string responseString = WebRequest?.GetResponseString();
string? responseString = WebRequest?.GetResponseString();
// naive check whether there's an error in the response to avoid unnecessary JSON deserialisation.
if (!string.IsNullOrEmpty(responseString) && responseString.Contains(@"""error"""))
@ -248,7 +244,7 @@ namespace osu.Game.Online.API
private class DisplayableError
{
[JsonProperty("error")]
public string ErrorMessage { get; set; }
public string ErrorMessage { get; set; } = string.Empty;
}
}

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

@ -23,6 +23,6 @@ namespace osu.Game.Online.API.Requests
return req;
}
protected override string Target => $@"chat/channels/{channel.Id}/users/{User.Id}";
protected override string Target => $@"chat/channels/{channel.Id}/users/{User!.Id}";
}
}

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

@ -23,6 +23,6 @@ namespace osu.Game.Online.API.Requests
return req;
}
protected override string Target => $@"chat/channels/{channel.Id}/users/{User.Id}";
protected override string Target => $@"chat/channels/{channel.Id}/users/{User!.Id}";
}
}

2
osu.Game/Online/Chat/WebSocketChatClient.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Online.Chat
fetchReq.Success += updates =>
{
if (updates?.Presence != null)
if (updates.Presence != null)
{
foreach (var channel in updates.Presence)
joinChannel(channel);

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

@ -27,6 +27,6 @@ namespace osu.Game.Online.Rooms
return req;
}
protected override string Target => $@"rooms/{Room.RoomID.Value}/users/{User.Id}";
protected override string Target => $@"rooms/{Room.RoomID.Value}/users/{User!.Id}";
}
}

2
osu.Game/Online/Rooms/PartRoomRequest.cs
View File

@ -23,6 +23,6 @@ namespace osu.Game.Online.Rooms
return req;
}
protected override string Target => $"rooms/{room.RoomID.Value}/users/{User.Id}";
protected override string Target => $"rooms/{room.RoomID.Value}/users/{User!.Id}";
}
}

2
osu.Game/Tests/PollingChatClient.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Tests
fetchReq.Success += updates =>
{
if (updates?.Presence != null)
if (updates.Presence != null)
{
foreach (var channel in updates.Presence)
handleChannelJoined(channel);