h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 15:04:26 +08:00
Code Issues Releases Wiki Activity

Revert "Hide blocked users from currently online"

Browse Source 
This reverts commits 7ca3a1895a and fbdea8f990.
This commit is contained in:
Zihad
2025-03-28 16:06:49 +06:00
Unverified
parent 7ca3a1895a
commit 68b3687315
2 changed files with 7 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
-82
View File
@@ -9,7 +9,6 @@ using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Database;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Metadata;
using osu.Game.Online.Spectator;
@@ -100,87 +99,6 @@ namespace osu.Game.Tests.Visual.Online
AddStep("End watching user presence", () => token.Dispose());
}
[Test]
public void TestBlockedUsersHidden()
{
IDisposable token = null!;
AddStep("Clear blocks", () =>
{
DummyAPIAccess api = (DummyAPIAccess)API;
api.Blocks.Clear();
});
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<UserGridPanel>().FirstOrDefault()?.User.Id == streamingUser.Id);
AddStep("Block online user", () =>
{
DummyAPIAccess api = (DummyAPIAccess)API;
api.Blocks.Add(new APIRelation()
{
RelationType = RelationType.Block,
TargetUser = streamingUser,
TargetID = streamingUser.Id
});
});
AddAssert("Blocked user not shown", () => currentlyOnline.ChildrenOfType<UserGridPanel>().All(p => p.User.Id != streamingUser.Id));
AddStep("Unblock online user", () =>
{
DummyAPIAccess api = (DummyAPIAccess)API;
api.Blocks.RemoveAll(b => b.TargetID == streamingUser.Id);
});
AddAssert("Unblocked user shown again", () => currentlyOnline.ChildrenOfType<UserGridPanel>().Any(p => p.User.Id == streamingUser.Id));
AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
AddStep("End watching user presence", () => token.Dispose());
}
[Test]
public void TestUnblockedOfflineUsersHidden()
{
IDisposable token = null!;
AddStep("Clear blocks", () =>
{
DummyAPIAccess api = (DummyAPIAccess)API;
api.Blocks.Clear();
});
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<UserGridPanel>().FirstOrDefault()?.User.Id == streamingUser.Id);
AddStep("Block online user", () =>
{
DummyAPIAccess api = (DummyAPIAccess)API;
api.Blocks.Add(new APIRelation()
{
RelationType = RelationType.Block,
TargetUser = streamingUser,
TargetID = streamingUser.Id
});
});
AddAssert("Blocked user not shown", () => currentlyOnline.ChildrenOfType<UserGridPanel>().All(p => p.User.Id != streamingUser.Id));
AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
AddStep("Unblock offline user", () =>
{
DummyAPIAccess api = (DummyAPIAccess)API;
api.Blocks.RemoveAll(b => b.TargetID == streamingUser.Id);
});
AddAssert("Unblocked offline user not shown", () => currentlyOnline.ChildrenOfType<UserGridPanel>().All(p => p.User.Id != streamingUser.Id));
AddStep("End watching user presence", () => token.Dispose());
}
internal partial class TestUserLookupCache : UserLookupCache
{
private static readonly string[] usernames =
osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
+7 -57
View File
@@ -2,9 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
@@ -16,7 +14,6 @@ using osu.Framework.Localisation;
using osu.Framework.Screens;
using osu.Game.Database;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Metadata;
using osu.Game.Resources.Localisation.Web;
@@ -34,7 +31,6 @@ namespace osu.Game.Overlays.Dashboard
private const float padding = 10;
private readonly IBindableDictionary<int, UserPresence> onlineUserPresences = new BindableDictionary<int, UserPresence>();
private readonly IBindableList<APIRelation> blockedUsers = new BindableList<APIRelation>();
private readonly Dictionary<int, OnlineUserPanel> userPanels = new Dictionary<int, OnlineUserPanel>();
private SearchContainer<OnlineUserPanel> userFlow = null!;
@@ -46,9 +42,6 @@ namespace osu.Game.Overlays.Dashboard
[Resolved]
private UserLookupCache users { get; set; } = null!;
[Resolved]
private IAPIProvider api { get; set; } = null!;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
@@ -102,8 +95,6 @@ namespace osu.Game.Overlays.Dashboard
onlineUserPresences.BindTo(metadataClient.UserPresences);
onlineUserPresences.BindCollectionChanged(onUserPresenceUpdated, true);
blockedUsers.BindTo(api.Blocks);
blockedUsers.BindCollectionChanged(onBlocksUpdated);
}
protected override void OnFocus(FocusEvent e)
@@ -113,36 +104,6 @@ namespace osu.Game.Overlays.Dashboard
searchTextBox.TakeFocus();
}
private void onBlocksUpdated(object? sender, NotifyCollectionChangedEventArgs e)
{
switch (e.Action)
{
case NotifyCollectionChangedAction.Add:
Debug.Assert(e.NewItems != null);
foreach (APIRelation block in e.NewItems.Cast<APIRelation>())
{
int userId = block.TargetID;
removeUserPanel(userId);
}
break;
case NotifyCollectionChangedAction.Remove:
Debug.Assert(e.OldItems != null);
foreach (APIRelation block in e.OldItems)
{
int userId = block.TargetID;
if (!onlineUserPresences.ContainsKey(userId)) continue;
addUserPanel(userId);
}
break;
}
}
private void onUserPresenceUpdated(object? sender, NotifyDictionaryChangedEventArgs<int, UserPresence> e) => Schedule(() =>
{
switch (e.Action)
@@ -153,9 +114,12 @@ namespace osu.Game.Overlays.Dashboard
foreach (var kvp in e.NewItems)
{
int userId = kvp.Key;
if (blockedUsers.Any(b => b.TargetID == userId)) continue;
addUserPanel(userId);
users.GetUserAsync(userId).ContinueWith(task =>
{
if (task.GetResultSafely() is APIUser user)
Schedule(() => userFlow.Add(userPanels[userId] = createUserPanel(user)));
});
}
break;
@@ -166,28 +130,14 @@ namespace osu.Game.Overlays.Dashboard
foreach (var kvp in e.OldItems)
{
int userId = kvp.Key;
removeUserPanel(userId);
if (userPanels.Remove(userId, out var userPanel))
userPanel.Expire();
}
break;
}
});
private void addUserPanel(int userId)
{
users.GetUserAsync(userId).ContinueWith(task =>
{
if (task.GetResultSafely() is APIUser user)
Schedule(() => userFlow.Add(userPanels[userId] = createUserPanel(user)));
});
}
private void removeUserPanel(int userId)
{
if (userPanels.Remove(userId, out var userPanel))
userPanel.Expire();
}
private OnlineUserPanel createUserPanel(APIUser user) =>
new OnlineUserPanel(user).With(panel =>
{