Make online status only handled by the config

smoogipoo · smoogipoo · commit 52d184280148 · 2025-01-15T18:09:17.000+09:00
diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
@@ -54,7 +54,7 @@ internal partial class DiscordRichPresence : Component
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
 
-        private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
+        private readonly Bindable<UserStatus> status = new Bindable<UserStatus>();
         private readonly IBindable<UserActivity?> activity = new Bindable<UserActivity?>();
         private readonly Bindable<DiscordRichPresenceMode> privacyMode = new Bindable<DiscordRichPresenceMode>();
 
@@ -106,9 +106,9 @@ protected override void LoadComplete()
             base.LoadComplete();
 
             config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);
+            config.BindWith(OsuSetting.UserOnlineStatus, status);
 
             user = api.LocalUser.GetBoundCopy();
-            status.BindTo(api.Status);
             activity.BindTo(api.Activity);
 
             ruleset.BindValueChanged(_ => schedulePresenceUpdate());
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
@@ -29,16 +29,16 @@ public partial class TestSceneLoginOverlay : OsuManualInputManagerTestScene
         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();
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            Dependencies.Cache(localConfig = new OsuConfigManager(LocalStorage));
+
             Child = loginOverlay = new LoginOverlay
             {
                 Anchor = Anchor.Centre,
@@ -49,6 +49,7 @@ private void load()
         [SetUpSteps]
         public void SetUpSteps()
         {
+            AddStep("reset online state", () => localConfig.SetValue(OsuSetting.UserOnlineStatus, UserStatus.Online));
             AddStep("show login overlay", () => loginOverlay.Show());
         }
 
@@ -89,7 +90,7 @@ public void TestLoginSuccess()
             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 @@ public void TestClickingOnFlagClosesOverlay()
         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);
         }
     }
 }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
@@ -443,7 +443,12 @@ public enum OsuSetting
         EditorShowSpeedChanges,
         TouchDisableGameplayTaps,
         ModSelectTextSearchStartsActive,
+
+        /// <summary>
+        /// The status for the current user that should be broadcast to other players.
+        /// </summary>
         UserOnlineStatus,
+
         MultiplayerRoomFilter,
         HideCountryFlags,
         EditorTimelineShowTimingChanges,
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
@@ -60,7 +60,6 @@ public partial class APIAccess : Component, IAPIProvider
 
         public IBindable<APIUser> LocalUser => localUser;
         public IBindableList<APIRelation> Friends => friends;
-        public Bindable<UserStatus> Status { get; } = new Bindable<UserStatus>(UserStatus.Online);
         public IBindable<UserActivity> Activity => activity;
 
         public INotificationsClient NotificationsClient { get; }
@@ -73,6 +72,8 @@ public partial class APIAccess : Component, IAPIProvider
 
         private Bindable<UserActivity> activity { get; } = new Bindable<UserActivity>();
 
+        private Bindable<UserStatus> configStatus { get; } = new Bindable<UserStatus>();
+
         protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
 
         private readonly CancellationTokenSource cancellationToken = new CancellationTokenSource();
@@ -108,7 +109,7 @@ public APIAccess(OsuGameBase game, OsuConfigManager config, EndpointConfiguratio
             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 +592,9 @@ public void Logout()
             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(() =>
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -28,8 +28,6 @@ public partial class DummyAPIAccess : Component, IAPIProvider
 
         public BindableList<APIRelation> Friends { get; } = new BindableList<APIRelation>();
 
-        public Bindable<UserStatus> Status { get; } = new Bindable<UserStatus>(UserStatus.Online);
-
         public Bindable<UserActivity?> Activity { get; } = new Bindable<UserActivity?>();
 
         public DummyNotificationsClient NotificationsClient { get; } = new DummyNotificationsClient();
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
@@ -24,11 +24,6 @@ public interface IAPIProvider
         /// </summary>
         IBindableList<APIRelation> Friends { get; }
 
-        /// <summary>
-        /// The current user's status.
-        /// </summary>
-        Bindable<UserStatus> Status { get; }
-
         /// <summary>
         /// The current user's activity.
         /// </summary>
diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -74,9 +74,9 @@ private void load(IAPIProvider api, OsuConfigManager config)
             }
 
             lastQueueId = config.GetBindable<int>(OsuSetting.LastProcessedMetadataId);
+            userStatus = config.GetBindable<UserStatus>(OsuSetting.UserOnlineStatus);
 
             localUser = api.LocalUser.GetBoundCopy();
-            userStatus = api.Status.GetBoundCopy();
             userActivity = api.Activity.GetBoundCopy()!;
         }
 
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -9,6 +9,7 @@
 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;
@@ -43,6 +44,9 @@ public partial class LoginPanel : Container
         [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,10 +69,10 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            config.BindWith(OsuSetting.UserOnlineStatus, status);
+
             apiState.BindTo(api.State);
             apiState.BindValueChanged(onlineStateChanged, true);
-
-            status.BindTo(api.Status);
             status.BindValueChanged(e => updateDropdownCurrent(e.NewValue), true);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,16 @@ public partial class TestSceneLoginOverlay : OsuManualInputManagerTestScene`
`29`	`29`	`private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;`
`30`	`30`
`31`	`31`	`private LoginOverlay loginOverlay = null!;`
`32`		`-`
`33`		`- [Resolved]`
`34`		`- private OsuConfigManager configManager { get; set; } = null!;`
	`32`	`+ private OsuConfigManager localConfig = null!;`
`35`	`33`
`36`	`34`	`[Cached(typeof(LocalUserStatisticsProvider))]`
`37`	`35`	`private readonly TestSceneUserPanel.TestUserStatisticsProvider statisticsProvider = new TestSceneUserPanel.TestUserStatisticsProvider();`
`38`	`36`
`39`	`37`	`[BackgroundDependencyLoader]`
`40`	`38`	`private void load()`
`41`	`39`	`{`
	`40`	`+ Dependencies.Cache(localConfig = new OsuConfigManager(LocalStorage));`
	`41`	`+`
`42`	`42`	`Child = loginOverlay = new LoginOverlay`
`43`	`43`	`{`
`44`	`44`	`Anchor = Anchor.Centre,`
`@@ -49,6 +49,7 @@ private void load()`
`49`	`49`	`[SetUpSteps]`
`50`	`50`	`public void SetUpSteps()`
`51`	`51`	`{`
	`52`	`+ AddStep("reset online state", () => localConfig.SetValue(OsuSetting.UserOnlineStatus, UserStatus.Online));`
`52`	`53`	`AddStep("show login overlay", () => loginOverlay.Show());`
`53`	`54`	`}`
`54`	`55`
`@@ -89,7 +90,7 @@ public void TestLoginSuccess()`
`89`	`90`	`AddStep("clear handler", () => dummyAPI.HandleRequest = null);`
`90`	`91`
`91`	`92`	`assertDropdownState(UserAction.Online);`
`92`		`- AddStep("change user state", () => dummyAPI.Status.Value = UserStatus.DoNotDisturb);`
	`93`	`+ AddStep("change user state", () => localConfig.SetValue(OsuSetting.UserOnlineStatus, UserStatus.DoNotDisturb));`
`93`	`94`	`assertDropdownState(UserAction.DoNotDisturb);`
`94`	`95`	`}`
`95`	`96`
`@@ -188,31 +189,31 @@ public void TestClickingOnFlagClosesOverlay()`
`188`	`189`	`public void TestUncheckingRememberUsernameClearsIt()`
`189`	`190`	`{`
`190`	`191`	`AddStep("logout", () => API.Logout());`
`191`		`- AddStep("set username", () => configManager.SetValue(OsuSetting.Username, "test_user"));`
`192`		`- AddStep("set remember password", () => configManager.SetValue(OsuSetting.SavePassword, true));`
	`192`	`+ AddStep("set username", () => localConfig.SetValue(OsuSetting.Username, "test_user"));`
	`193`	`+ AddStep("set remember password", () => localConfig.SetValue(OsuSetting.SavePassword, true));`
`193`	`194`	`AddStep("uncheck remember username", () =>`
`194`	`195`	`{`
`195`	`196`	`InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<SettingsCheckbox>().First());`
`196`	`197`	`InputManager.Click(MouseButton.Left);`
`197`	`198`	`});`
`198`		`- AddAssert("remember username off", () => configManager.Get<bool>(OsuSetting.SaveUsername), () => Is.False);`
`199`		`- AddAssert("remember password off", () => configManager.Get<bool>(OsuSetting.SavePassword), () => Is.False);`
`200`		`- AddAssert("username cleared", () => configManager.Get<string>(OsuSetting.Username), () => Is.Empty);`
	`199`	`+ AddAssert("remember username off", () => localConfig.Get<bool>(OsuSetting.SaveUsername), () => Is.False);`
	`200`	`+ AddAssert("remember password off", () => localConfig.Get<bool>(OsuSetting.SavePassword), () => Is.False);`
	`201`	`+ AddAssert("username cleared", () => localConfig.Get<string>(OsuSetting.Username), () => Is.Empty);`
`201`	`202`	`}`
`202`	`203`
`203`	`204`	`[Test]`
`204`	`205`	`public void TestUncheckingRememberPasswordClearsToken()`
`205`	`206`	`{`
`206`	`207`	`AddStep("logout", () => API.Logout());`
`207`		`- AddStep("set token", () => configManager.SetValue(OsuSetting.Token, "test_token"));`
`208`		`- AddStep("set remember password", () => configManager.SetValue(OsuSetting.SavePassword, true));`
	`208`	`+ AddStep("set token", () => localConfig.SetValue(OsuSetting.Token, "test_token"));`
	`209`	`+ AddStep("set remember password", () => localConfig.SetValue(OsuSetting.SavePassword, true));`
`209`	`210`	`AddStep("uncheck remember token", () =>`
`210`	`211`	`{`
`211`	`212`	`InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<SettingsCheckbox>().Last());`
`212`	`213`	`InputManager.Click(MouseButton.Left);`
`213`	`214`	`});`
`214`		`- AddAssert("remember password off", () => configManager.Get<bool>(OsuSetting.SavePassword), () => Is.False);`
`215`		`- AddAssert("token cleared", () => configManager.Get<string>(OsuSetting.Token), () => Is.Empty);`
	`215`	`+ AddAssert("remember password off", () => localConfig.Get<bool>(OsuSetting.SavePassword), () => Is.False);`
	`216`	`+ AddAssert("token cleared", () => localConfig.Get<string>(OsuSetting.Token), () => Is.Empty);`
`216`	`217`	`}`
`217`	`218`	`}`
`218`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,9 @@ private void load(IAPIProvider api, OsuConfigManager config)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`lastQueueId = config.GetBindable<int>(OsuSetting.LastProcessedMetadataId);`
	`77`	`+ userStatus = config.GetBindable<UserStatus>(OsuSetting.UserOnlineStatus);`
`77`	`78`
`78`	`79`	`localUser = api.LocalUser.GetBoundCopy();`
`79`		`- userStatus = api.Status.GetBoundCopy();`
`80`	`80`	`userActivity = api.Activity.GetBoundCopy()!;`
`81`	`81`	`}`
`82`	`82`