sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

add methods to get a user from their username

Browse Source
This commit is contained in:
Davran Dilshat
2021-08-29 19:19:55 +01:00
parent 7122f48568
commit 90c313e2ad
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Online/API/Requests/GetUserRequest.cs
View File

@ -8,15 +8,25 @@ namespace osu.Game.Online.API.Requests
{ {
public class GetUserRequest : APIRequest<User> public class GetUserRequest : APIRequest<User>
{ {
private readonly long? userId; private readonly string userIdentifier;
public readonly RulesetInfo Ruleset; public readonly RulesetInfo Ruleset;
public GetUserRequest()
{
}
public GetUserRequest(long? userId = null, RulesetInfo ruleset = null) public GetUserRequest(long? userId = null, RulesetInfo ruleset = null)
{ {
this.userId = userId; this.userIdentifier = userId.ToString();
Ruleset = ruleset; Ruleset = ruleset;
} }
protected override string Target => userId.HasValue ? $@"users/{userId}/{Ruleset?.ShortName}" : $@"me/{Ruleset?.ShortName}"; public GetUserRequest(string username = null, RulesetInfo ruleset = null)
{
this.userIdentifier = username;
Ruleset = ruleset;
}
protected override string Target => (userIdentifier != null) ? $@"users/{userIdentifier}/{Ruleset?.ShortName}" : $@"me/{Ruleset?.ShortName}";
} }
} }

9
osu.Game/OsuGame.cs
View File

@ -329,8 +329,7 @@ namespace osu.Game
break; break;
case LinkAction.OpenUserProfile: case LinkAction.OpenUserProfile:
if (int.TryParse(link.Argument, out int userId)) ShowUser(link.Argument);
ShowUser(userId);
break; break;
case LinkAction.OpenWiki: case LinkAction.OpenWiki:
@ -378,6 +377,12 @@ namespace osu.Game
/// <param name="userId">The user to display.</param> /// <param name="userId">The user to display.</param>
public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId)); public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
/// <summary>
/// Show a user's profile as an overlay.
/// </summary>
/// <param name="username">The user to display.</param>
public void ShowUser(string username) => waitForReady(() => userProfile, _ => userProfile.ShowUser(username));
/// <summary> /// <summary>
/// Show a beatmap's set as an overlay, displaying the given beatmap. /// Show a beatmap's set as an overlay, displaying the given beatmap.
/// </summary> /// </summary>

4
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -40,6 +40,8 @@ namespace osu.Game.Overlays
public void ShowUser(int userId) => ShowUser(new User { Id = userId }); public void ShowUser(int userId) => ShowUser(new User { Id = userId });
public void ShowUser(string username) => ShowUser(new User { Username = username });
public void ShowUser(User user, bool fetchOnline = true) public void ShowUser(User user, bool fetchOnline = true)
{ {
if (user == User.SYSTEM_USER) if (user == User.SYSTEM_USER)
@ -116,7 +118,7 @@ namespace osu.Game.Overlays
if (fetchOnline) if (fetchOnline)
{ {
userReq = new GetUserRequest(user.Id); userReq = user.Username != null ? new GetUserRequest(user.Username) : new GetUserRequest(user.Id);
userReq.Success += userLoadComplete; userReq.Success += userLoadComplete;
API.Queue(userReq); API.Queue(userReq);
} }