Rename User to APIUser and move to correct namespace

This commit is contained in:
Dean Herbert
2021-11-04 18:02:44 +09:00
parent 69aa620ab7
commit 0ecf5f201c
195 changed files with 990 additions and 946 deletions

View File

@ -17,6 +17,7 @@ using osu.Framework.Graphics;
using osu.Framework.Logging;
using osu.Game.Configuration;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Users;
namespace osu.Game.Online.API
@ -41,13 +42,13 @@ namespace osu.Game.Online.API
private string password;
public IBindable<User> LocalUser => localUser;
public IBindableList<User> Friends => friends;
public IBindable<APIUser> LocalUser => localUser;
public IBindableList<APIUser> Friends => friends;
public IBindable<UserActivity> Activity => activity;
private Bindable<User> localUser { get; } = new Bindable<User>(createGuestUser());
private Bindable<APIUser> localUser { get; } = new Bindable<APIUser>(createGuestUser());
private BindableList<User> friends { get; } = new BindableList<User>();
private BindableList<APIUser> friends { get; } = new BindableList<APIUser>();
private Bindable<UserActivity> activity { get; } = new Bindable<UserActivity>();
@ -436,7 +437,7 @@ namespace osu.Game.Online.API
flushQueue();
}
private static User createGuestUser() => new GuestUser();
private static APIUser createGuestUser() => new GuestUser();
protected override void Dispose(bool isDisposing)
{
@ -447,7 +448,7 @@ namespace osu.Game.Online.API
}
}
internal class GuestUser : User
internal class GuestUser : APIUser
{
public GuestUser()
{