mirror of
https://github.com/ppy/osu.git
synced 2026-05-26 05:19:56 +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>
112 lines
4.7 KiB
C#
112 lines
4.7 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 NUnit.Framework;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Game.Beatmaps;
|
|
using osu.Game.Online.API.Requests.Responses;
|
|
using osu.Game.Online.Metadata;
|
|
using osu.Game.Overlays;
|
|
using osu.Game.Overlays.Dashboard.CurrentlyOnline;
|
|
using osu.Game.Rulesets;
|
|
using osu.Game.Tests.Visual.Metadata;
|
|
using osu.Game.Users;
|
|
using osuTK;
|
|
|
|
namespace osu.Game.Tests.Visual.Online
|
|
{
|
|
[TestFixture]
|
|
public partial class TestSceneOnlineUserPanel : OsuTestScene
|
|
{
|
|
[Cached]
|
|
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
|
|
|
|
[Resolved]
|
|
private IRulesetStore rulesetStore { get; set; } = null!;
|
|
|
|
private TestMetadataClient metadataClient = null!;
|
|
private OnlineUserListPanel panel = null!;
|
|
|
|
[SetUp]
|
|
public void SetUp() => Schedule(() =>
|
|
{
|
|
Child = new DependencyProvidingContainer
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
CachedDependencies =
|
|
[
|
|
(typeof(MetadataClient), metadataClient = new TestMetadataClient())
|
|
],
|
|
Children = new Drawable[]
|
|
{
|
|
metadataClient,
|
|
new FillFlowContainer
|
|
{
|
|
Anchor = Anchor.Centre,
|
|
Origin = Anchor.Centre,
|
|
AutoSizeAxes = Axes.Y,
|
|
RelativeSizeAxes = Axes.X,
|
|
Spacing = new Vector2(10f),
|
|
Children = new Drawable[]
|
|
{
|
|
new OnlineUserGridPanel(new APIUser
|
|
{
|
|
Username = @"flyte",
|
|
Id = 3103765,
|
|
CountryCode = CountryCode.JP,
|
|
CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
|
|
WasRecentlyOnline = true
|
|
}),
|
|
new OnlineUserGridPanel(new APIUser
|
|
{
|
|
Username = @"peppy",
|
|
Id = 2,
|
|
CountryCode = CountryCode.AU,
|
|
CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
|
|
IsSupporter = true,
|
|
SupportLevel = 3,
|
|
}),
|
|
new OnlineUserListPanel(new APIUser
|
|
{
|
|
Username = @"flyte",
|
|
Id = 3103765,
|
|
CountryCode = CountryCode.JP,
|
|
CoverUrl = @"https://assets.ppy.sh/user-cover-presets/1/df28696b58541a9e67f6755918951d542d93bdf1da41720fcca2fd2c1ea8cf51.jpeg",
|
|
WasRecentlyOnline = true
|
|
}),
|
|
panel = new OnlineUserListPanel(new APIUser
|
|
{
|
|
Username = @"peppy",
|
|
Id = 2,
|
|
CountryCode = CountryCode.AU,
|
|
CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
|
|
LastVisit = DateTimeOffset.Now
|
|
}),
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
metadataClient.BeginWatchingUserPresence();
|
|
});
|
|
|
|
[Test]
|
|
public void TestUserActivity()
|
|
{
|
|
AddStep("idle", () => setPresence(UserStatus.Online, null));
|
|
AddStep("in game", () => setPresence(UserStatus.Online, new UserActivity.InSoloGame(new BeatmapInfo(), rulesetStore.GetRuleset(0)!)));
|
|
}
|
|
|
|
private void setPresence(UserStatus status, UserActivity? activity, int? userId = null)
|
|
{
|
|
if (status == UserStatus.Offline)
|
|
metadataClient.UserPresenceUpdated(userId ?? panel.User.OnlineID, null);
|
|
else
|
|
metadataClient.UserPresenceUpdated(userId ?? panel.User.OnlineID, new UserPresence { Status = status, Activity = activity });
|
|
}
|
|
}
|
|
}
|