h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-31 05:13:22 +08:00
Code Issues Releases Wiki Activity

Merge branch 'remove-status-from-apiuser' into user-panel-status

Browse Source
This commit is contained in:
Dan Balasescu 2025-01-16 17:16:43 +09:00
commit fd75ae2614
No known key found for this signature in database
8 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop/DiscordRichPresence.cs
View File

@ -145,7 +145,7 @@ namespace osu.Desktop
if (!client.IsInitialized)
return;
if (status.Value == UserStatus.Offline || privacyMode.Value == DiscordRichPresenceMode.Off)
if (!api.IsLoggedIn || status.Value == UserStatus.Offline || privacyMode.Value == DiscordRichPresenceMode.Off)
{
client.ClearPresence();
return;

27
osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
View File

@ -29,9 +29,7 @@ namespace osu.Game.Tests.Visual.Menus
private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
private LoginOverlay loginOverlay = null!;
[Resolved]
private OsuConfigManager configManager { get; set; } = null!;
private OsuConfigManager localConfig = null!;
[Cached(typeof(LocalUserStatisticsProvider))]
private readonly TestSceneUserPanel.TestUserStatisticsProvider statisticsProvider = new TestSceneUserPanel.TestUserStatisticsProvider();
@ -39,6 +37,8 @@ namespace osu.Game.Tests.Visual.Menus
[BackgroundDependencyLoader]
private void load()
{
Dependencies.Cache(localConfig = new OsuConfigManager(LocalStorage));
Child = loginOverlay = new LoginOverlay
{
Anchor = Anchor.Centre,
@ -49,6 +49,7 @@ namespace osu.Game.Tests.Visual.Menus
[SetUpSteps]
public void SetUpSteps()
{
AddStep("reset online state", () => localConfig.SetValue(OsuSetting.UserOnlineStatus, UserStatus.Online));
AddStep("show login overlay", () => loginOverlay.Show());
}
@ -89,7 +90,7 @@ namespace osu.Game.Tests.Visual.Menus
AddStep("clear handler", () => dummyAPI.HandleRequest = null);
assertDropdownState(UserAction.Online);
AddStep("change user state", () => dummyAPI.Status.Value = UserStatus.DoNotDisturb);
AddStep("change user state", () => localConfig.SetValue(OsuSetting.UserOnlineStatus, UserStatus.DoNotDisturb));
assertDropdownState(UserAction.DoNotDisturb);
}
@ -188,31 +189,31 @@ namespace osu.Game.Tests.Visual.Menus
public void TestUncheckingRememberUsernameClearsIt()
{
AddStep("logout", () => API.Logout());
AddStep("set username", () => configManager.SetValue(OsuSetting.Username, "test_user"));
AddStep("set remember password", () => configManager.SetValue(OsuSetting.SavePassword, true));
AddStep("set username", () => localConfig.SetValue(OsuSetting.Username, "test_user"));
AddStep("set remember password", () => localConfig.SetValue(OsuSetting.SavePassword, true));
AddStep("uncheck remember username", () =>
{
InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<SettingsCheckbox>().First());
InputManager.Click(MouseButton.Left);
});
AddAssert("remember username off", () => configManager.Get<bool>(OsuSetting.SaveUsername), () => Is.False);
AddAssert("remember password off", () => configManager.Get<bool>(OsuSetting.SavePassword), () => Is.False);
AddAssert("username cleared", () => configManager.Get<string>(OsuSetting.Username), () => Is.Empty);
AddAssert("remember username off", () => localConfig.Get<bool>(OsuSetting.SaveUsername), () => Is.False);
AddAssert("remember password off", () => localConfig.Get<bool>(OsuSetting.SavePassword), () => Is.False);
AddAssert("username cleared", () => localConfig.Get<string>(OsuSetting.Username), () => Is.Empty);
}
[Test]
public void TestUncheckingRememberPasswordClearsToken()
{
AddStep("logout", () => API.Logout());
AddStep("set token", () => configManager.SetValue(OsuSetting.Token, "test_token"));
AddStep("set remember password", () => configManager.SetValue(OsuSetting.SavePassword, true));
AddStep("set token", () => localConfig.SetValue(OsuSetting.Token, "test_token"));
AddStep("set remember password", () => localConfig.SetValue(OsuSetting.SavePassword, true));
AddStep("uncheck remember token", () =>
{
InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<SettingsCheckbox>().Last());
InputManager.Click(MouseButton.Left);
});
AddAssert("remember password off", () => configManager.Get<bool>(OsuSetting.SavePassword), () => Is.False);
AddAssert("token cleared", () => configManager.Get<string>(OsuSetting.Token), () => Is.Empty);
AddAssert("remember password off", () => localConfig.Get<bool>(OsuSetting.SavePassword), () => Is.False);
AddAssert("token cleared", () => localConfig.Get<string>(OsuSetting.Token), () => Is.Empty);
}
}
}

5
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -443,7 +443,12 @@ namespace osu.Game.Configuration
EditorShowSpeedChanges,
TouchDisableGameplayTaps,
ModSelectTextSearchStartsActive,
/// <summary>
/// The status for the current user to broadcast to other players.
/// </summary>
UserOnlineStatus,
MultiplayerRoomFilter,
HideCountryFlags,
EditorTimelineShowTimingChanges,

10
osu.Game/Online/API/APIAccess.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Online.API
public IBindable<APIUser> LocalUser => localUser;
public IBindableList<APIRelation> Friends => friends;
public Bindable<UserStatus> Status { get; } = new Bindable<UserStatus>(UserStatus.Online);
public IBindable<UserStatus> Status => configStatus;
public IBindable<UserActivity> Activity => activity;
public INotificationsClient NotificationsClient { get; }
@ -75,8 +75,8 @@ namespace osu.Game.Online.API
protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
private readonly Bindable<UserStatus> configStatus = new Bindable<UserStatus>();
private readonly CancellationTokenSource cancellationToken = new CancellationTokenSource();
private readonly Logger log;
public APIAccess(OsuGameBase game, OsuConfigManager config, EndpointConfiguration endpointConfiguration, string versionHash)
@ -108,7 +108,7 @@ namespace osu.Game.Online.API
authentication.TokenString = config.Get<string>(OsuSetting.Token);
authentication.Token.ValueChanged += onTokenChanged;
config.BindWith(OsuSetting.UserOnlineStatus, Status);
config.BindWith(OsuSetting.UserOnlineStatus, configStatus);
if (HasLogin)
{
@ -591,7 +591,9 @@ namespace osu.Game.Online.API
password = null;
SecondFactorCode = null;
authentication.Clear();
Status.Value = UserStatus.Online;
// Reset the status to be broadcast on the next login, in case multiple players share the same system.
configStatus.Value = UserStatus.Online;
// Scheduled prior to state change such that the state changed event is invoked with the correct user and their friends present
Schedule(() =>

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

@ -197,6 +197,7 @@ namespace osu.Game.Online.API
IBindable<APIUser> IAPIProvider.LocalUser => LocalUser;
IBindableList<APIRelation> IAPIProvider.Friends => Friends;
IBindable<UserStatus> IAPIProvider.Status => Status;
IBindable<UserActivity?> IAPIProvider.Activity => Activity;
/// <summary>

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

@ -25,12 +25,12 @@ namespace osu.Game.Online.API
IBindableList<APIRelation> Friends { get; }
/// <summary>
/// The current user's status.
/// The status for the current user that's broadcast to other players.
/// </summary>
Bindable<UserStatus> Status { get; }
IBindable<UserStatus> Status { get; }
/// <summary>
/// The current user's activity.
/// The activity for the current user that's broadcast to other players.
/// </summary>
IBindable<UserActivity?> Activity { get; }

1
osu.Game/Online/Metadata/OnlineMetadataClient.cs
View File

@ -37,7 +37,6 @@ namespace osu.Game.Online.Metadata
private IHubClientConnector? connector;
private Bindable<int> lastQueueId = null!;
private IBindable<APIUser> localUser = null!;
private IBindable<UserStatus> userStatus = null!;
private IBindable<UserActivity?> userActivity = null!;

20
osu.Game/Overlays/Login/LoginPanel.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Input.Events;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
@ -37,12 +38,15 @@ namespace osu.Game.Overlays.Login
/// </summary>
public Action? RequestHide;
private readonly Bindable<UserStatus> status = new Bindable<UserStatus>();
private readonly IBindable<APIState> apiState = new Bindable<APIState>();
private readonly Bindable<UserStatus> configUserStatus = new Bindable<UserStatus>();
[Resolved]
private IAPIProvider api { get; set; } = null!;
[Resolved]
private OsuConfigManager config { get; set; } = null!;
public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty;
public bool Bounding
@ -65,11 +69,11 @@ namespace osu.Game.Overlays.Login
{
base.LoadComplete();
config.BindWith(OsuSetting.UserOnlineStatus, configUserStatus);
configUserStatus.BindValueChanged(e => updateDropdownCurrent(e.NewValue), true);
apiState.BindTo(api.State);
apiState.BindValueChanged(onlineStateChanged, true);
status.BindTo(api.Status);
status.BindValueChanged(e => updateDropdownCurrent(e.NewValue), true);
}
private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
@ -148,23 +152,23 @@ namespace osu.Game.Overlays.Login
},
};
updateDropdownCurrent(status.Value);
updateDropdownCurrent(configUserStatus.Value);
dropdown.Current.BindValueChanged(action =>
{
switch (action.NewValue)
{
case UserAction.Online:
status.Value = UserStatus.Online;
configUserStatus.Value = UserStatus.Online;
dropdown.StatusColour = colours.Green;
break;
case UserAction.DoNotDisturb:
status.Value = UserStatus.DoNotDisturb;
configUserStatus.Value = UserStatus.DoNotDisturb;
dropdown.StatusColour = colours.Red;
break;
case UserAction.AppearOffline:
status.Value = UserStatus.Offline;
configUserStatus.Value = UserStatus.Offline;
dropdown.StatusColour = colours.Gray7;
break;