mirror of
https://github.com/ppy/osu.git
synced 2026-06-09 13:54:17 +08:00
1230da33a5
- Adds sorting and display styles. - Saves sort/display modes to the config. - Improves performance, especially on the 2nd+ time opening the overlay. https://github.com/user-attachments/assets/e32b50d0-58a1-4eef-b18c-988fb497e545 --- Coming off some recent feedback in https://github.com/ppy/osu/discussions/33426#discussioncomment-13431275, I decided to take a bit of a detour and get a little bit more functionality in. Sorting by rank, although it should technically work, doesn't work right now. This is because the osu!web API doesn't return user rank on `/user/` lookups - it's only returned for the friends request. I'm leaving this open as a discussion topic. - We can make osu!web return the rank and osu! will require no further changes to work correctly, or - We can try to implement additional paths through `osu-server-spectator` which would blow this PR out of proportion and is best left for a task of its own. For simplicity, I've re-implemented this display mostly as its own component for now, lifting code from `FriendDisplay` which was recently overhauled. These implementations should eventually be combined somehow but that's dependent on: 1. Figuring out the styling - friends can display offline users for which it makes no sense to display the "spectate" button. 2. Figuring out how to handle the different users/presence pathways. It's mostly a code complexity issue. --------- Co-authored-by: Dean Herbert <pe@ppy.sh> Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
142 lines
6.4 KiB
C#
142 lines
6.4 KiB
C#
// 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;
|
|
using System.Linq;
|
|
using NUnit.Framework;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Testing;
|
|
using osu.Game.Online.API;
|
|
using osu.Game.Online.API.Requests;
|
|
using osu.Game.Online.API.Requests.Responses;
|
|
using osu.Game.Online.Metadata;
|
|
using osu.Game.Online.Spectator;
|
|
using osu.Game.Overlays;
|
|
using osu.Game.Overlays.Dashboard.CurrentlyOnline;
|
|
using osu.Game.Tests.Visual.Metadata;
|
|
using osu.Game.Tests.Visual.Spectator;
|
|
using osu.Game.Users;
|
|
|
|
namespace osu.Game.Tests.Visual.Online
|
|
{
|
|
public partial class TestSceneCurrentlyOnlineDisplay : OsuTestScene
|
|
{
|
|
private static readonly string[] usernames =
|
|
{
|
|
"fieryrage",
|
|
"Kerensa",
|
|
"MillhioreF",
|
|
"Player01",
|
|
"smoogipoo",
|
|
"Ephemeral",
|
|
"BTMC",
|
|
"Cilvery",
|
|
"m980",
|
|
"HappyStick",
|
|
"LittleEndu",
|
|
"frenzibyte",
|
|
"Zallius",
|
|
"BanchoBot",
|
|
"rocketminer210",
|
|
"pishifat"
|
|
};
|
|
|
|
private readonly APIUser streamingUser = new APIUser { Id = 2, Username = "Test user" };
|
|
|
|
private TestSpectatorClient spectatorClient = null!;
|
|
private TestMetadataClient metadataClient = null!;
|
|
private CurrentlyOnlineDisplay currentlyOnline = null!;
|
|
|
|
[SetUpSteps]
|
|
public void SetUpSteps()
|
|
{
|
|
AddStep("set up components", () =>
|
|
{
|
|
spectatorClient = new TestSpectatorClient();
|
|
metadataClient = new TestMetadataClient();
|
|
|
|
((DummyAPIAccess)API).HandleRequest = req =>
|
|
{
|
|
switch (req)
|
|
{
|
|
case LookupUsersRequest lookupUsersRequest:
|
|
var users = lookupUsersRequest.UserIds.Select(id =>
|
|
{
|
|
// tests against failed lookups
|
|
if (id == 13)
|
|
return null;
|
|
|
|
return new APIUser
|
|
{
|
|
Id = id,
|
|
Username = usernames[id % usernames.Length],
|
|
};
|
|
}).ToList();
|
|
lookupUsersRequest.TriggerSuccess(new GetUsersResponse { Users = users });
|
|
return true;
|
|
|
|
default:
|
|
return false;
|
|
}
|
|
};
|
|
|
|
Children = new Drawable[]
|
|
{
|
|
spectatorClient,
|
|
metadataClient,
|
|
new DependencyProvidingContainer
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
CachedDependencies = new (Type, object)[]
|
|
{
|
|
(typeof(SpectatorClient), spectatorClient),
|
|
(typeof(MetadataClient), metadataClient),
|
|
(typeof(OverlayColourProvider), new OverlayColourProvider(OverlayColourScheme.Purple)),
|
|
},
|
|
Child = currentlyOnline = new CurrentlyOnlineDisplay()
|
|
},
|
|
};
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void TestBasicDisplay()
|
|
{
|
|
IDisposable token = null!;
|
|
|
|
AddStep("Begin watching user presence", () => token = metadataClient.BeginWatchingUserPresence());
|
|
AddStep("Add online user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.ChoosingBeatmap() }));
|
|
AddUntilStep("Panel loaded", () => currentlyOnline.ChildrenOfType<OnlineUserPanel>().FirstOrDefault()?.User.Id == 2);
|
|
AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<OnlineUserPanel>().First().CanSpectate.Value, () => Is.False);
|
|
|
|
AddStep("User began playing", () => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.InSoloGame() }));
|
|
AddAssert("Spectate button enabled", () => currentlyOnline.ChildrenOfType<OnlineUserPanel>().First().CanSpectate.Value, () => Is.True);
|
|
|
|
AddStep("User finished playing",
|
|
() => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.ChoosingBeatmap() }));
|
|
AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<OnlineUserPanel>().First().CanSpectate.Value, () => Is.False);
|
|
|
|
AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
|
|
AddUntilStep("Panel no longer present", () => !currentlyOnline.ChildrenOfType<OnlineUserPanel>().Any());
|
|
AddStep("End watching user presence", () => token.Dispose());
|
|
}
|
|
|
|
[Test]
|
|
public void TestUserWasPlayingBeforeWatchingUserPresence()
|
|
{
|
|
IDisposable token = null!;
|
|
|
|
AddStep("Begin watching user presence", () => token = metadataClient.BeginWatchingUserPresence());
|
|
AddStep("Add online user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.InSoloGame() }));
|
|
AddUntilStep("Panel loaded", () => currentlyOnline.ChildrenOfType<OnlineUserPanel>().FirstOrDefault()?.User.Id == streamingUser.Id);
|
|
AddAssert("Spectate button enabled", () => currentlyOnline.ChildrenOfType<OnlineUserPanel>().First().CanSpectate.Value, () => Is.True);
|
|
|
|
AddStep("User finished playing",
|
|
() => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.ChoosingBeatmap() }));
|
|
AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<OnlineUserPanel>().First().CanSpectate.Value, () => Is.False);
|
|
AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
|
|
AddStep("End watching user presence", () => token.Dispose());
|
|
}
|
|
}
|
|
}
|