From 3cfbbac5dc9ae96335a476b829b46de88b4f2299 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 6 Aug 2019 17:47:31 +0300
Subject: [PATCH] Expand requests

---
 osu.Game/Online/API/Requests/GetUserRequest.cs   |  7 +++++--
 .../Online/API/Requests/GetUserScoresRequest.cs  | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetUserRequest.cs b/osu.Game/Online/API/Requests/GetUserRequest.cs
index 37ed0574f1..18fb4bb7db 100644
--- a/osu.Game/Online/API/Requests/GetUserRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRequest.cs
@@ -2,18 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Users;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {
     public class GetUserRequest : APIRequest<User>
     {
         private readonly long? userId;
+        private readonly RulesetInfo ruleset;
 
-        public GetUserRequest(long? userId = null)
+        public GetUserRequest(long? userId = null, RulesetInfo ruleset = null)
         {
             this.userId = userId;
+            this.ruleset = ruleset;
         }
 
-        protected override string Target => userId.HasValue ? $@"users/{userId}" : @"me";
+        protected override string Target => userId.HasValue ? (ruleset != null ? $@"users/{userId}/{ruleset.ShortName}" : $@"users/{userId}") : @"me";
     }
 }
diff --git a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
index d41966fe1b..7b4d66e7b2 100644
--- a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.IO.Network;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {
@@ -10,12 +12,24 @@ public class GetUserScoresRequest : PaginatedAPIRequest<List<APILegacyScoreInfo>
     {
         private readonly long userId;
         private readonly ScoreType type;
+        private readonly RulesetInfo ruleset;
 
-        public GetUserScoresRequest(long userId, ScoreType type, int page = 0, int itemsPerPage = 5)
+        public GetUserScoresRequest(long userId, ScoreType type, int page = 0, int itemsPerPage = 5, RulesetInfo ruleset = null)
             : base(page, itemsPerPage)
         {
             this.userId = userId;
             this.type = type;
+            this.ruleset = ruleset;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            if (ruleset != null)
+                req.AddParameter("mode", ruleset.ShortName);
+
+            return req;
         }
 
         protected override string Target => $@"users/{userId}/scores/{type.ToString().ToLowerInvariant()}";