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

Move activity (writable) bindable to APIAccess so it correctly transfers between users

Browse Source
This commit is contained in:
Dean Herbert 2019-06-12 18:04:57 +09:00
parent 20b43c20c8
commit f358fce9ab
8 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Users;
@ -61,12 +62,16 @@ namespace osu.Game.Tests.Visual.Online
[Test]
public void UserActivitiesTests()
{
AddStep("idle", () => { peppy.Activity.Value = null; });
AddStep("spectating", () => { peppy.Activity.Value = new UserActivity.Spectating(); });
AddStep("solo", () => { peppy.Activity.Value = new UserActivity.SoloGame(null, null); });
AddStep("choosing", () => { peppy.Activity.Value = new UserActivity.ChoosingBeatmap(); });
AddStep("editing", () => { peppy.Activity.Value = new UserActivity.Editing(null); });
AddStep("modding", () => { peppy.Activity.Value = new UserActivity.Modding(); });
Bindable<UserActivity> activity = new Bindable<UserActivity>();
peppy.Activity.BindTo(activity);
AddStep("idle", () => { activity.Value = null; });
AddStep("spectating", () => { activity.Value = new UserActivity.Spectating(); });
AddStep("solo", () => { activity.Value = new UserActivity.SoloGame(null, null); });
AddStep("choosing", () => { activity.Value = new UserActivity.ChoosingBeatmap(); });
AddStep("editing", () => { activity.Value = new UserActivity.Editing(null); });
AddStep("modding", () => { activity.Value = new UserActivity.Modding(); });
}
}
}

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

@ -37,6 +37,8 @@ namespace osu.Game.Online.API
public Bindable<User> LocalUser { get; } = new Bindable<User>(createGuestUser());
public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
private readonly CancellationTokenSource cancellationToken = new CancellationTokenSource();
@ -55,6 +57,12 @@ namespace osu.Game.Online.API
authentication.TokenString = config.Get<string>(OsuSetting.Token);
authentication.Token.ValueChanged += onTokenChanged;
LocalUser.BindValueChanged(u =>
{
u.OldValue?.Activity.UnbindFrom(Activity);
u.NewValue.Activity.BindTo(Activity);
}, true);
var thread = new Thread(run)
{
Name = "APIAccess",

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

@ -17,6 +17,8 @@ namespace osu.Game.Online.API
Id = 1001,
});
public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
public bool IsLoggedIn => true;
public string ProvidedUsername => LocalUser.Value.Username;
@ -41,6 +43,15 @@ namespace osu.Game.Online.API
}
}
public DummyAPIAccess()
{
LocalUser.BindValueChanged(u =>
{
u.OldValue?.Activity.UnbindFrom(Activity);
u.NewValue.Activity.BindTo(Activity);
}, true);
}
public virtual void Queue(APIRequest request)
{
}

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

@ -13,6 +13,11 @@ namespace osu.Game.Online.API
/// </summary>
Bindable<User> LocalUser { get; }
/// <summary>
/// The current user's activity.
/// </summary>
Bindable<UserActivity> Activity { get; }
/// <summary>
/// Returns whether the local user is logged in.
/// </summary>

6
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -156,7 +156,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
panel.Status.BindTo(api.LocalUser.Value.Status);
panel.Activity.BindTo(api.LocalUser.Value.Activity);
dropdown.Current.ValueChanged += action =>
dropdown.Current.BindValueChanged(action =>
{
switch (action.NewValue)
{
@ -179,9 +179,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
api.Logout();
break;
}
};
dropdown.Current.TriggerChange();
}, true);
break;
}

2
osu.Game/Screens/OsuScreen.cs
View File

@ -193,7 +193,7 @@ namespace osu.Game.Screens
private void updateActivity()
{
if (api != null)
api.LocalUser.Value.Activity.Value = activity;
api.Activity.Value = activity;
}
/// <summary>

2
osu.Game/Users/User.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Users
public Bindable<UserStatus> Status = new Bindable<UserStatus>();
public Bindable<UserActivity> Activity = new Bindable<UserActivity>();
public IBindable<UserActivity> Activity = new Bindable<UserActivity>();
//public Team Team;

2
osu.Game/Users/UserPanel.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Users
public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
public readonly Bindable<UserActivity> Activity = new Bindable<UserActivity>();
public readonly IBindable<UserActivity> Activity = new Bindable<UserActivity>();
public new Action Action;