sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename User to APIUser and move to correct namespace

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -18,10 +18,10 @@ using osu.Game.Database;
using osu.Game.IO;
using osu.Game.IO.Archives;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays.Notifications;
using osu.Game.Rulesets;
using osu.Game.Skinning;
using osu.Game.Users;
namespace osu.Game.Beatmaps
{
@ -68,7 +68,7 @@ namespace osu.Game.Beatmaps
/// <summary>
/// Create a new <see cref="WorkingBeatmap"/>.
/// </summary>
public WorkingBeatmap CreateNew(RulesetInfo ruleset, User user)
public WorkingBeatmap CreateNew(RulesetInfo ruleset, APIUser user)
{
var metadata = new BeatmapMetadata
{

12
osu.Game/Beatmaps/BeatmapMetadata.cs
View File

@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
using Newtonsoft.Json;
using osu.Framework.Testing;
using osu.Game.Database;
using osu.Game.Users;
using osu.Game.Online.API.Requests.Responses;
#nullable enable
@ -36,7 +36,7 @@ namespace osu.Game.Beatmaps
public List<BeatmapSetInfo> BeatmapSets { get; set; } = new List<BeatmapSetInfo>();
/// <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")]
[Column("AuthorID")]
@ -45,13 +45,13 @@ namespace osu.Game.Beatmaps
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")]
[Column("Author")]
@ -60,7 +60,7 @@ namespace osu.Game.Beatmaps
get => Author?.Username ?? string.Empty;
set
{
Author ??= new User();
Author ??= new APIUser();
Author.Username = value;
}
}
@ -69,7 +69,7 @@ namespace osu.Game.Beatmaps
/// The author of the beatmaps in this set.
/// </summary>
[JsonIgnore]
public User? Author;
public APIUser? Author;
public string Source { get; set; } = string.Empty;