From 90c313e2ad4d67d827f5617feacba4b1a693fb12 Mon Sep 17 00:00:00 2001
From: Davran Dilshat <davran.dilshat@gmail.com>
Date: Sun, 29 Aug 2021 19:19:55 +0100
Subject: [PATCH] add methods to get a user from their username

---
 osu.Game/Online/API/Requests/GetUserRequest.cs | 16 +++++++++++++---
 osu.Game/OsuGame.cs                            |  9 +++++++--
 osu.Game/Overlays/UserProfileOverlay.cs        |  4 +++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetUserRequest.cs b/osu.Game/Online/API/Requests/GetUserRequest.cs
index 42aad6f9eb..48041cd40c 100644
--- a/osu.Game/Online/API/Requests/GetUserRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRequest.cs
@@ -8,15 +8,25 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetUserRequest : APIRequest<User>
     {
-        private readonly long? userId;
+        private readonly string userIdentifier;
         public readonly RulesetInfo Ruleset;
 
+        public GetUserRequest()
+        {
+        }
+
         public GetUserRequest(long? userId = null, RulesetInfo ruleset = null)
         {
-            this.userId = userId;
+            this.userIdentifier = userId.ToString();
             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}";
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 4d952c39c6..26fa1d5a4c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -329,8 +329,7 @@ namespace osu.Game
                     break;
 
                 case LinkAction.OpenUserProfile:
-                    if (int.TryParse(link.Argument, out int userId))
-                        ShowUser(userId);
+                    ShowUser(link.Argument);
                     break;
 
                 case LinkAction.OpenWiki:
@@ -378,6 +377,12 @@ namespace osu.Game
         /// <param name="userId">The user to display.</param>
         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>
         /// Show a beatmap's set as an overlay, displaying the given beatmap.
         /// </summary>
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 299a14b250..6e74acc96a 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Overlays
 
         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)
         {
             if (user == User.SYSTEM_USER)
@@ -116,7 +118,7 @@ namespace osu.Game.Overlays
 
             if (fetchOnline)
             {
-                userReq = new GetUserRequest(user.Id);
+                userReq = user.Username != null ? new GetUserRequest(user.Username) : new GetUserRequest(user.Id);
                 userReq.Success += userLoadComplete;
                 API.Queue(userReq);
             }