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 25b0bccfd5
commit b9983add15
195 changed files with 991 additions and 947 deletions

View File

@ -6,7 +6,6 @@ using System.Collections.Generic;
using Newtonsoft.Json;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Users;
#nullable enable
@ -72,10 +71,10 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty("artist_unicode")]
public string ArtistUnicode { get; set; } = string.Empty;
public User? Author = new User();
public APIUser? Author = new APIUser();
/// <summary>
/// Helper property to deserialize a username to <see cref="User"/>.
/// Helper property to deserialize a username to <see cref="APIUser"/>.
/// </summary>
[JsonProperty(@"user_id")]
public int AuthorID
@ -83,13 +82,13 @@ namespace osu.Game.Online.API.Requests.Responses
get => Author?.Id ?? 1;
set
{
Author ??= new User();
Author ??= new APIUser();
Author.Id = value;
}
}
/// <summary>
/// Helper property to deserialize a username to <see cref="User"/>.
/// Helper property to deserialize a username to <see cref="APIUser"/>.
/// </summary>
[JsonProperty(@"creator")]
public string AuthorString
@ -97,7 +96,7 @@ namespace osu.Game.Online.API.Requests.Responses
get => Author?.Username ?? string.Empty;
set
{
Author ??= new User();
Author ??= new APIUser();
Author.Username = value;
}
}