RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-28 01:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28357 from peppy/dont-fail-acks

Browse Source 
Avoid `ChatAckRequest` failures flooding console in `OsuGameTestScene`s
This commit is contained in:
Dan Balasescu 2024-05-30 18:15:25 +09:00 committed by GitHub
commit 981b69de2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Chat/TestSceneChannelManager.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Tests.Chat
return true;
case ChatAckRequest ack:
ack.TriggerSuccess(new ChatAckResponse { Silences = silencedUserIds.Select(u => new ChatSilence { UserId = u }).ToList() });
ack.TriggerSuccess(new ChatAckResponse { Silences = silencedUserIds.Select(u => new ChatSilence { UserId = u }).ToArray() });
silencedUserIds.Clear();
return true;

7
osu.Game/Online/API/DummyAPIAccess.cs
View File

@ -84,6 +84,13 @@ namespace osu.Game.Online.API
{
if (HandleRequest?.Invoke(request) != true)
{
// Noisy so let's silently allow these to succeed.
if (request is ChatAckRequest ack)
{
ack.TriggerSuccess(new ChatAckResponse());
return;
}
request.Fail(new InvalidOperationException($@"{nameof(DummyAPIAccess)} cannot process this request."));
}
});

2
osu.Game/Online/API/IAPIProvider.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Online.API
string APIEndpointUrl { get; }
/// <summary>
/// The root URL of of the website, excluding the trailing slash.
/// The root URL of the website, excluding the trailing slash.
/// </summary>
string WebsiteRootUrl { get; }

4
osu.Game/Online/API/Requests/Responses/ChatAckResponse.cs
View File

@ -1,7 +1,7 @@
// 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.
using System.Collections.Generic;
using System;
using Newtonsoft.Json;
namespace osu.Game.Online.API.Requests.Responses
@ -10,6 +10,6 @@ namespace osu.Game.Online.API.Requests.Responses
public class ChatAckResponse
{
[JsonProperty("silences")]
public List<ChatSilence> Silences { get; set; } = null!;
public ChatSilence[] Silences { get; set; } = Array.Empty<ChatSilence>();
}
}