From 9d59cd408fda8b931d77f9001ac38a31a4a91fb7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Apr 2022 22:59:49 +0300
Subject: [PATCH 1/4] Add concept of "initial items count" in paginated API
 requests

---
 .../Online/API/Requests/GetUserBeatmapsRequest.cs   |  4 ++--
 .../API/Requests/GetUserKudosuHistoryRequest.cs     |  4 ++--
 .../Requests/GetUserMostPlayedBeatmapsRequest.cs    |  4 ++--
 .../API/Requests/GetUserRecentActivitiesRequest.cs  |  4 ++--
 .../Online/API/Requests/GetUserScoresRequest.cs     |  4 ++--
 osu.Game/Online/API/Requests/PaginatedAPIRequest.cs | 13 ++++++++++---
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
index e2c0ed4301..b7681cb71b 100644
--- a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Online.API.Requests
 
         private readonly BeatmapSetType type;
 
-        public GetUserBeatmapsRequest(long userId, BeatmapSetType type, int page = 0, int itemsPerPage = 6)
-            : base(page, itemsPerPage)
+        public GetUserBeatmapsRequest(long userId, BeatmapSetType type, int page, int itemsPerPage, int initialItems)
+            : base(page, itemsPerPage, initialItems)
         {
             this.userId = userId;
             this.type = type;
diff --git a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
index e90e297672..d2102d7697 100644
--- a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserKudosuHistoryRequest(long userId, int page = 0, int itemsPerPage = 5)
-            : base(page, itemsPerPage)
+        public GetUserKudosuHistoryRequest(long userId, int page, int itemsPerPage, int initialItems)
+            : base(page, itemsPerPage, initialItems)
         {
             this.userId = userId;
         }
diff --git a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
index 9f094e51c4..a9b6dd7edc 100644
--- a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserMostPlayedBeatmapsRequest(long userId, int page = 0, int itemsPerPage = 5)
-            : base(page, itemsPerPage)
+        public GetUserMostPlayedBeatmapsRequest(long userId, int page, int itemsPerPage, int initialItems)
+            : base(page, itemsPerPage, initialItems)
         {
             this.userId = userId;
         }
diff --git a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
index f2fa51bde7..60acc27182 100644
--- a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserRecentActivitiesRequest(long userId, int page = 0, int itemsPerPage = 5)
-            : base(page, itemsPerPage)
+        public GetUserRecentActivitiesRequest(long userId, int page, int itemsPerPage, int initialItems)
+            : base(page, itemsPerPage, initialItems)
         {
             this.userId = userId;
         }
diff --git a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
index 5d39799f6b..85b58fc596 100644
--- a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Online.API.Requests
         private readonly ScoreType type;
         private readonly RulesetInfo ruleset;
 
-        public GetUserScoresRequest(long userId, ScoreType type, int page = 0, int itemsPerPage = 5, RulesetInfo ruleset = null)
-            : base(page, itemsPerPage)
+        public GetUserScoresRequest(long userId, ScoreType type, int page, int itemsPerPage, int initialItems, RulesetInfo ruleset = null)
+            : base(page, itemsPerPage, initialItems)
         {
             this.userId = userId;
             this.type = type;
diff --git a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
index bddc34a0dc..ea59fcfc25 100644
--- a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
+++ b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
@@ -9,11 +9,13 @@ namespace osu.Game.Online.API.Requests
     public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class
     {
         private readonly int page;
+        private readonly int initialItems;
         private readonly int itemsPerPage;
 
-        protected PaginatedAPIRequest(int page, int itemsPerPage)
+        protected PaginatedAPIRequest(int page, int itemsPerPage, int initialItems)
         {
             this.page = page;
+            this.initialItems = initialItems;
             this.itemsPerPage = itemsPerPage;
         }
 
@@ -21,8 +23,13 @@ namespace osu.Game.Online.API.Requests
         {
             var req = base.CreateWebRequest();
 
-            req.AddParameter("offset", (page * itemsPerPage).ToString(CultureInfo.InvariantCulture));
-            req.AddParameter("limit", itemsPerPage.ToString(CultureInfo.InvariantCulture));
+            if (page == 0)
+                req.AddParameter("limit", initialItems.ToString(CultureInfo.InvariantCulture));
+            else
+            {
+                req.AddParameter("offset", (initialItems + (page - 1) * itemsPerPage).ToString(CultureInfo.InvariantCulture));
+                req.AddParameter("limit", itemsPerPage.ToString(CultureInfo.InvariantCulture));
+            }
 
             return req;
         }

From f08449e432d11625ec3b3fa3ad5d95df1ef091c8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Apr 2022 23:04:21 +0300
Subject: [PATCH 2/4] Update paginated profile subsections to display items
 inline with web

---
 .../Beatmaps/PaginatedBeatmapContainer.cs     |  7 ++++---
 .../PaginatedMostPlayedBeatmapContainer.cs    |  5 ++---
 .../Kudosu/PaginatedKudosuHistoryContainer.cs |  5 ++---
 .../Sections/PaginatedProfileSubsection.cs    | 19 +++++++++++++++----
 .../Sections/Ranks/PaginatedScoreContainer.cs |  6 ++----
 .../PaginatedRecentActivityContainer.cs       |  5 ++---
 6 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index d39074bd49..deeb63b5bf 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -20,11 +20,12 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
         private const float panel_padding = 10f;
         private readonly BeatmapSetType type;
 
+        protected override int InitialItemsCount => type == BeatmapSetType.Graveyard ? 2 : 6;
+
         public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<APIUser> user, LocalisableString headerText)
             : base(user, headerText)
         {
             this.type = type;
-            ItemsPerPage = 6;
         }
 
         [BackgroundDependencyLoader]
@@ -57,8 +58,8 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
             }
         }
 
-        protected override APIRequest<List<APIBeatmapSet>> CreateRequest() =>
-            new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
+        protected override APIRequest<List<APIBeatmapSet>> CreateRequest(int itemsPerPage, int initialItems) =>
+            new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++, itemsPerPage, initialItems);
 
         protected override Drawable CreateDrawableItem(APIBeatmapSet model) => model.OnlineID > 0
             ? new BeatmapCardNormal(model)
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index ad1192a13a..ccd60fcd89 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         public PaginatedMostPlayedBeatmapContainer(Bindable<APIUser> user)
             : base(user, UsersStrings.ShowExtraHistoricalMostPlayedTitle)
         {
-            ItemsPerPage = 5;
         }
 
         [BackgroundDependencyLoader]
@@ -30,8 +29,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
         protected override int GetCount(APIUser user) => user.BeatmapPlayCountsCount;
 
-        protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest() =>
-            new GetUserMostPlayedBeatmapsRequest(User.Value.Id, VisiblePages++, ItemsPerPage);
+        protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest(int itemsPerPage, int initialItems) =>
+            new GetUserMostPlayedBeatmapsRequest(User.Value.Id, VisiblePages++, itemsPerPage, initialItems);
 
         protected override Drawable CreateDrawableItem(APIUserMostPlayedBeatmap mostPlayed) =>
             new DrawableMostPlayedBeatmap(mostPlayed);
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index c4837cc0e2..311a64a10d 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -17,11 +17,10 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
         public PaginatedKudosuHistoryContainer(Bindable<APIUser> user)
             : base(user, missingText: UsersStrings.ShowExtraKudosuEntryEmpty)
         {
-            ItemsPerPage = 5;
         }
 
-        protected override APIRequest<List<APIKudosuHistory>> CreateRequest()
-            => new GetUserKudosuHistoryRequest(User.Value.Id, VisiblePages++, ItemsPerPage);
+        protected override APIRequest<List<APIKudosuHistory>> CreateRequest(int itemsPerPage, int initialItems)
+            => new GetUserKudosuHistoryRequest(User.Value.Id, VisiblePages++, itemsPerPage, initialItems);
 
         protected override Drawable CreateDrawableItem(APIKudosuHistory item) => new DrawableKudosuHistoryItem(item);
     }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 9dcbf6142d..646c16fbd7 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -21,11 +21,20 @@ namespace osu.Game.Overlays.Profile.Sections
 {
     public abstract class PaginatedProfileSubsection<TModel> : ProfileSubsection
     {
+        /// <summary>
+        /// The number of items displayed per page.
+        /// </summary>
+        protected virtual int ItemsPerPage => 50;
+
+        /// <summary>
+        /// The number of items displayed initially.
+        /// </summary>
+        protected virtual int InitialItemsCount => 5;
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
         protected int VisiblePages;
-        protected int ItemsPerPage;
 
         protected ReverseChildIDFillFlowContainer<Drawable> ItemsContainer { get; private set; }
 
@@ -101,7 +110,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             loadCancellation = new CancellationTokenSource();
 
-            retrievalRequest = CreateRequest();
+            retrievalRequest = CreateRequest(ItemsPerPage, InitialItemsCount);
             retrievalRequest.Success += UpdateItems;
 
             api.Queue(retrievalRequest);
@@ -125,7 +134,9 @@ namespace osu.Game.Overlays.Profile.Sections
             LoadComponentsAsync(items.Select(CreateDrawableItem).Where(d => d != null), drawables =>
             {
                 missing.Hide();
-                moreButton.FadeTo(items.Count == ItemsPerPage ? 1 : 0);
+
+                int maxCount = VisiblePages == 1 ? InitialItemsCount : ItemsPerPage;
+                moreButton.FadeTo(items.Count == maxCount ? 1 : 0);
                 moreButton.IsLoading = false;
 
                 ItemsContainer.AddRange(drawables);
@@ -138,7 +149,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
         }
 
-        protected abstract APIRequest<List<TModel>> CreateRequest();
+        protected abstract APIRequest<List<TModel>> CreateRequest(int itemsPerPage, int initialItems);
 
         protected abstract Drawable CreateDrawableItem(TModel model);
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 5c67da1911..cc5952017d 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             : base(user, headerText)
         {
             this.type = type;
-
-            ItemsPerPage = 5;
         }
 
         [BackgroundDependencyLoader]
@@ -62,8 +60,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             base.OnItemsReceived(items);
         }
 
-        protected override APIRequest<List<APIScore>> CreateRequest() =>
-            new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
+        protected override APIRequest<List<APIScore>> CreateRequest(int itemsPerPage, int initialItems) =>
+            new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, itemsPerPage, initialItems);
 
         private int drawableItemIndex;
 
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index c5ff896654..60cba95fda 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         public PaginatedRecentActivityContainer(Bindable<APIUser> user)
             : base(user, missingText: EventsStrings.Empty)
         {
-            ItemsPerPage = 10;
         }
 
         [BackgroundDependencyLoader]
@@ -28,8 +27,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             ItemsContainer.Spacing = new Vector2(0, 8);
         }
 
-        protected override APIRequest<List<APIRecentActivity>> CreateRequest() =>
-            new GetUserRecentActivitiesRequest(User.Value.Id, VisiblePages++, ItemsPerPage);
+        protected override APIRequest<List<APIRecentActivity>> CreateRequest(int itemsPerPage, int initialItems) =>
+            new GetUserRecentActivitiesRequest(User.Value.Id, VisiblePages++, itemsPerPage, initialItems);
 
         protected override Drawable CreateDrawableItem(APIRecentActivity model) => new DrawableRecentActivity(model);
     }

From 96d4369cc823d71370f1c2fa9f8faaecba66f828 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Apr 2022 02:04:23 +0300
Subject: [PATCH 3/4] Introduce `Pagination` and simplify paginated API
 requests

---
 .../API/Requests/GetUserBeatmapsRequest.cs    |  4 +-
 .../Requests/GetUserKudosuHistoryRequest.cs   |  4 +-
 .../GetUserMostPlayedBeatmapsRequest.cs       |  4 +-
 .../GetUserRecentActivitiesRequest.cs         |  4 +-
 .../API/Requests/GetUserScoresRequest.cs      |  4 +-
 .../API/Requests/PaginatedAPIRequest.cs       | 19 +++-------
 osu.Game/Online/API/Requests/Pagination.cs    | 38 +++++++++++++++++++
 .../Beatmaps/PaginatedBeatmapContainer.cs     |  4 +-
 .../PaginatedMostPlayedBeatmapContainer.cs    |  4 +-
 .../Kudosu/PaginatedKudosuHistoryContainer.cs |  4 +-
 .../Sections/PaginatedProfileSubsection.cs    | 16 ++++----
 .../Sections/Ranks/PaginatedScoreContainer.cs |  6 +--
 .../PaginatedRecentActivityContainer.cs       |  4 +-
 13 files changed, 73 insertions(+), 42 deletions(-)
 create mode 100644 osu.Game/Online/API/Requests/Pagination.cs

diff --git a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
index b7681cb71b..019c805c9a 100644
--- a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Online.API.Requests
 
         private readonly BeatmapSetType type;
 
-        public GetUserBeatmapsRequest(long userId, BeatmapSetType type, int page, int itemsPerPage, int initialItems)
-            : base(page, itemsPerPage, initialItems)
+        public GetUserBeatmapsRequest(long userId, BeatmapSetType type, Pagination pagination)
+            : base(pagination)
         {
             this.userId = userId;
             this.type = type;
diff --git a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
index d2102d7697..3759c59722 100644
--- a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserKudosuHistoryRequest(long userId, int page, int itemsPerPage, int initialItems)
-            : base(page, itemsPerPage, initialItems)
+        public GetUserKudosuHistoryRequest(long userId, Pagination pagination)
+            : base(pagination)
         {
             this.userId = userId;
         }
diff --git a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
index a9b6dd7edc..37359e2cd0 100644
--- a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserMostPlayedBeatmapsRequest(long userId, int page, int itemsPerPage, int initialItems)
-            : base(page, itemsPerPage, initialItems)
+        public GetUserMostPlayedBeatmapsRequest(long userId, Pagination pagination)
+            : base(pagination)
         {
             this.userId = userId;
         }
diff --git a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
index 60acc27182..c16633c17a 100644
--- a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserRecentActivitiesRequest(long userId, int page, int itemsPerPage, int initialItems)
-            : base(page, itemsPerPage, initialItems)
+        public GetUserRecentActivitiesRequest(long userId, Pagination pagination)
+            : base(pagination)
         {
             this.userId = userId;
         }
diff --git a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
index 85b58fc596..af01969a1a 100644
--- a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Online.API.Requests
         private readonly ScoreType type;
         private readonly RulesetInfo ruleset;
 
-        public GetUserScoresRequest(long userId, ScoreType type, int page, int itemsPerPage, int initialItems, RulesetInfo ruleset = null)
-            : base(page, itemsPerPage, initialItems)
+        public GetUserScoresRequest(long userId, ScoreType type, Pagination pagination, RulesetInfo ruleset = null)
+            : base(pagination)
         {
             this.userId = userId;
             this.type = type;
diff --git a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
index ea59fcfc25..ddc453bf17 100644
--- a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
+++ b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
@@ -8,28 +8,19 @@ namespace osu.Game.Online.API.Requests
 {
     public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class
     {
-        private readonly int page;
-        private readonly int initialItems;
-        private readonly int itemsPerPage;
+        private readonly Pagination pagination;
 
-        protected PaginatedAPIRequest(int page, int itemsPerPage, int initialItems)
+        protected PaginatedAPIRequest(Pagination pagination)
         {
-            this.page = page;
-            this.initialItems = initialItems;
-            this.itemsPerPage = itemsPerPage;
+            this.pagination = pagination;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
 
-            if (page == 0)
-                req.AddParameter("limit", initialItems.ToString(CultureInfo.InvariantCulture));
-            else
-            {
-                req.AddParameter("offset", (initialItems + (page - 1) * itemsPerPage).ToString(CultureInfo.InvariantCulture));
-                req.AddParameter("limit", itemsPerPage.ToString(CultureInfo.InvariantCulture));
-            }
+            req.AddParameter("offset", pagination.Offset.ToString(CultureInfo.InvariantCulture));
+            req.AddParameter("limit", pagination.Limit.ToString(CultureInfo.InvariantCulture));
 
             return req;
         }
diff --git a/osu.Game/Online/API/Requests/Pagination.cs b/osu.Game/Online/API/Requests/Pagination.cs
new file mode 100644
index 0000000000..a1caac7592
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Pagination.cs
@@ -0,0 +1,38 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online.API.Requests
+{
+    /// <summary>
+    /// Represents a pagination data used for <see cref="PaginatedAPIRequest{T}"/>.
+    /// </summary>
+    public readonly struct Pagination
+    {
+        /// <summary>
+        /// The starting point of the request.
+        /// </summary>
+        public int Offset { get; }
+
+        /// <summary>
+        /// The maximum number of items to return in this request.
+        /// </summary>
+        public int Limit { get; }
+
+        public Pagination(int offset, int limit)
+        {
+            Offset = offset;
+            Limit = limit;
+        }
+
+        public Pagination(int limit)
+            : this(0, limit)
+        {
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Pagination"/> of the next number of items defined by <paramref name="limit"/> after this.
+        /// </summary>
+        /// <param name="limit">The limit of the next pagination.</param>
+        public Pagination TakeNext(int limit) => new Pagination(Offset + Limit, limit);
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index deeb63b5bf..f1c2b4bf7a 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -58,8 +58,8 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
             }
         }
 
-        protected override APIRequest<List<APIBeatmapSet>> CreateRequest(int itemsPerPage, int initialItems) =>
-            new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++, itemsPerPage, initialItems);
+        protected override APIRequest<List<APIBeatmapSet>> CreateRequest(Pagination pagination) =>
+            new GetUserBeatmapsRequest(User.Value.Id, type, pagination);
 
         protected override Drawable CreateDrawableItem(APIBeatmapSet model) => model.OnlineID > 0
             ? new BeatmapCardNormal(model)
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index ccd60fcd89..281bcc3a03 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
         protected override int GetCount(APIUser user) => user.BeatmapPlayCountsCount;
 
-        protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest(int itemsPerPage, int initialItems) =>
-            new GetUserMostPlayedBeatmapsRequest(User.Value.Id, VisiblePages++, itemsPerPage, initialItems);
+        protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest(Pagination pagination) =>
+            new GetUserMostPlayedBeatmapsRequest(User.Value.Id, pagination);
 
         protected override Drawable CreateDrawableItem(APIUserMostPlayedBeatmap mostPlayed) =>
             new DrawableMostPlayedBeatmap(mostPlayed);
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index 311a64a10d..5aada2b655 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
         {
         }
 
-        protected override APIRequest<List<APIKudosuHistory>> CreateRequest(int itemsPerPage, int initialItems)
-            => new GetUserKudosuHistoryRequest(User.Value.Id, VisiblePages++, itemsPerPage, initialItems);
+        protected override APIRequest<List<APIKudosuHistory>> CreateRequest(Pagination pagination)
+            => new GetUserKudosuHistoryRequest(User.Value.Id, pagination);
 
         protected override Drawable CreateDrawableItem(APIKudosuHistory item) => new DrawableKudosuHistoryItem(item);
     }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 646c16fbd7..a1f9e7546a 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
@@ -34,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Sections
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        protected int VisiblePages;
+        protected Pagination? CurrentPage { get; private set; }
 
         protected ReverseChildIDFillFlowContainer<Drawable> ItemsContainer { get; private set; }
 
@@ -96,7 +97,7 @@ namespace osu.Game.Overlays.Profile.Sections
             loadCancellation?.Cancel();
             retrievalRequest?.Cancel();
 
-            VisiblePages = 0;
+            CurrentPage = null;
             ItemsContainer.Clear();
 
             if (e.NewValue != null)
@@ -110,7 +111,9 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             loadCancellation = new CancellationTokenSource();
 
-            retrievalRequest = CreateRequest(ItemsPerPage, InitialItemsCount);
+            CurrentPage = CurrentPage?.TakeNext(ItemsPerPage) ?? new Pagination(InitialItemsCount);
+
+            retrievalRequest = CreateRequest(CurrentPage.Value);
             retrievalRequest.Success += UpdateItems;
 
             api.Queue(retrievalRequest);
@@ -120,7 +123,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             OnItemsReceived(items);
 
-            if (!items.Any() && VisiblePages == 1)
+            if (!items.Any() && CurrentPage?.Offset == 0)
             {
                 moreButton.Hide();
                 moreButton.IsLoading = false;
@@ -135,8 +138,7 @@ namespace osu.Game.Overlays.Profile.Sections
             {
                 missing.Hide();
 
-                int maxCount = VisiblePages == 1 ? InitialItemsCount : ItemsPerPage;
-                moreButton.FadeTo(items.Count == maxCount ? 1 : 0);
+                moreButton.FadeTo(items.Count == CurrentPage?.Limit ? 1 : 0);
                 moreButton.IsLoading = false;
 
                 ItemsContainer.AddRange(drawables);
@@ -149,7 +151,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
         }
 
-        protected abstract APIRequest<List<TModel>> CreateRequest(int itemsPerPage, int initialItems);
+        protected abstract APIRequest<List<TModel>> CreateRequest(Pagination pagination);
 
         protected abstract Drawable CreateDrawableItem(TModel model);
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index cc5952017d..c3a5e3f8b8 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -54,14 +54,14 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 
         protected override void OnItemsReceived(List<APIScore> items)
         {
-            if (VisiblePages == 0)
+            if (CurrentPage == null || CurrentPage?.Offset == 0)
                 drawableItemIndex = 0;
 
             base.OnItemsReceived(items);
         }
 
-        protected override APIRequest<List<APIScore>> CreateRequest(int itemsPerPage, int initialItems) =>
-            new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, itemsPerPage, initialItems);
+        protected override APIRequest<List<APIScore>> CreateRequest(Pagination pagination) =>
+            new GetUserScoresRequest(User.Value.Id, type, pagination);
 
         private int drawableItemIndex;
 
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index 60cba95fda..e5118094ce 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -27,8 +27,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             ItemsContainer.Spacing = new Vector2(0, 8);
         }
 
-        protected override APIRequest<List<APIRecentActivity>> CreateRequest(int itemsPerPage, int initialItems) =>
-            new GetUserRecentActivitiesRequest(User.Value.Id, VisiblePages++, itemsPerPage, initialItems);
+        protected override APIRequest<List<APIRecentActivity>> CreateRequest(Pagination pagination) =>
+            new GetUserRecentActivitiesRequest(User.Value.Id, pagination);
 
         protected override Drawable CreateDrawableItem(APIRecentActivity model) => new DrawableRecentActivity(model);
     }

From c858ec24833b2020a434180d9f63a8a472ec7173 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Apr 2022 02:48:34 +0300
Subject: [PATCH 4/4] `Pagination` -> `PaginationParameters

---
 osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs |  2 +-
 .../Online/API/Requests/GetUserKudosuHistoryRequest.cs |  2 +-
 .../API/Requests/GetUserMostPlayedBeatmapsRequest.cs   |  2 +-
 .../API/Requests/GetUserRecentActivitiesRequest.cs     |  2 +-
 osu.Game/Online/API/Requests/GetUserScoresRequest.cs   |  2 +-
 osu.Game/Online/API/Requests/PaginatedAPIRequest.cs    |  4 ++--
 .../{Pagination.cs => PaginationParameters.cs}         | 10 +++++-----
 .../Sections/Beatmaps/PaginatedBeatmapContainer.cs     |  2 +-
 .../Historical/PaginatedMostPlayedBeatmapContainer.cs  |  2 +-
 .../Sections/Kudosu/PaginatedKudosuHistoryContainer.cs |  2 +-
 .../Profile/Sections/PaginatedProfileSubsection.cs     |  6 +++---
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs  |  2 +-
 .../Recent/PaginatedRecentActivityContainer.cs         |  2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)
 rename osu.Game/Online/API/Requests/{Pagination.cs => PaginationParameters.cs} (68%)

diff --git a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
index 019c805c9a..ffb3a3be9b 100644
--- a/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Online.API.Requests
 
         private readonly BeatmapSetType type;
 
-        public GetUserBeatmapsRequest(long userId, BeatmapSetType type, Pagination pagination)
+        public GetUserBeatmapsRequest(long userId, BeatmapSetType type, PaginationParameters pagination)
             : base(pagination)
         {
             this.userId = userId;
diff --git a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
index 3759c59722..67d3ad26b0 100644
--- a/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserKudosuHistoryRequest.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserKudosuHistoryRequest(long userId, Pagination pagination)
+        public GetUserKudosuHistoryRequest(long userId, PaginationParameters pagination)
             : base(pagination)
         {
             this.userId = userId;
diff --git a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
index 37359e2cd0..bef3df42fb 100644
--- a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserMostPlayedBeatmapsRequest(long userId, Pagination pagination)
+        public GetUserMostPlayedBeatmapsRequest(long userId, PaginationParameters pagination)
             : base(pagination)
         {
             this.userId = userId;
diff --git a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
index c16633c17a..79f0549d4a 100644
--- a/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.API.Requests
     {
         private readonly long userId;
 
-        public GetUserRecentActivitiesRequest(long userId, Pagination pagination)
+        public GetUserRecentActivitiesRequest(long userId, PaginationParameters pagination)
             : base(pagination)
         {
             this.userId = userId;
diff --git a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
index af01969a1a..7250929f11 100644
--- a/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserScoresRequest.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Online.API.Requests
         private readonly ScoreType type;
         private readonly RulesetInfo ruleset;
 
-        public GetUserScoresRequest(long userId, ScoreType type, Pagination pagination, RulesetInfo ruleset = null)
+        public GetUserScoresRequest(long userId, ScoreType type, PaginationParameters pagination, RulesetInfo ruleset = null)
             : base(pagination)
         {
             this.userId = userId;
diff --git a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
index ddc453bf17..3d719de958 100644
--- a/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
+++ b/osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
@@ -8,9 +8,9 @@ namespace osu.Game.Online.API.Requests
 {
     public abstract class PaginatedAPIRequest<T> : APIRequest<T> where T : class
     {
-        private readonly Pagination pagination;
+        private readonly PaginationParameters pagination;
 
-        protected PaginatedAPIRequest(Pagination pagination)
+        protected PaginatedAPIRequest(PaginationParameters pagination)
         {
             this.pagination = pagination;
         }
diff --git a/osu.Game/Online/API/Requests/Pagination.cs b/osu.Game/Online/API/Requests/PaginationParameters.cs
similarity index 68%
rename from osu.Game/Online/API/Requests/Pagination.cs
rename to osu.Game/Online/API/Requests/PaginationParameters.cs
index a1caac7592..3593a4fe83 100644
--- a/osu.Game/Online/API/Requests/Pagination.cs
+++ b/osu.Game/Online/API/Requests/PaginationParameters.cs
@@ -6,7 +6,7 @@ namespace osu.Game.Online.API.Requests
     /// <summary>
     /// Represents a pagination data used for <see cref="PaginatedAPIRequest{T}"/>.
     /// </summary>
-    public readonly struct Pagination
+    public readonly struct PaginationParameters
     {
         /// <summary>
         /// The starting point of the request.
@@ -18,21 +18,21 @@ namespace osu.Game.Online.API.Requests
         /// </summary>
         public int Limit { get; }
 
-        public Pagination(int offset, int limit)
+        public PaginationParameters(int offset, int limit)
         {
             Offset = offset;
             Limit = limit;
         }
 
-        public Pagination(int limit)
+        public PaginationParameters(int limit)
             : this(0, limit)
         {
         }
 
         /// <summary>
-        /// Returns a <see cref="Pagination"/> of the next number of items defined by <paramref name="limit"/> after this.
+        /// Returns a <see cref="PaginationParameters"/> of the next number of items defined by <paramref name="limit"/> after this.
         /// </summary>
         /// <param name="limit">The limit of the next pagination.</param>
-        public Pagination TakeNext(int limit) => new Pagination(Offset + Limit, limit);
+        public PaginationParameters TakeNext(int limit) => new PaginationParameters(Offset + Limit, limit);
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index f1c2b4bf7a..0424fe8bd9 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
             }
         }
 
-        protected override APIRequest<List<APIBeatmapSet>> CreateRequest(Pagination pagination) =>
+        protected override APIRequest<List<APIBeatmapSet>> CreateRequest(PaginationParameters pagination) =>
             new GetUserBeatmapsRequest(User.Value.Id, type, pagination);
 
         protected override Drawable CreateDrawableItem(APIBeatmapSet model) => model.OnlineID > 0
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index 281bcc3a03..06de0f62dc 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
         protected override int GetCount(APIUser user) => user.BeatmapPlayCountsCount;
 
-        protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest(Pagination pagination) =>
+        protected override APIRequest<List<APIUserMostPlayedBeatmap>> CreateRequest(PaginationParameters pagination) =>
             new GetUserMostPlayedBeatmapsRequest(User.Value.Id, pagination);
 
         protected override Drawable CreateDrawableItem(APIUserMostPlayedBeatmap mostPlayed) =>
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
index 5aada2b655..9af854e6b9 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/PaginatedKudosuHistoryContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
         {
         }
 
-        protected override APIRequest<List<APIKudosuHistory>> CreateRequest(Pagination pagination)
+        protected override APIRequest<List<APIKudosuHistory>> CreateRequest(PaginationParameters pagination)
             => new GetUserKudosuHistoryRequest(User.Value.Id, pagination);
 
         protected override Drawable CreateDrawableItem(APIKudosuHistory item) => new DrawableKudosuHistoryItem(item);
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index a1f9e7546a..33bd155d71 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Sections
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        protected Pagination? CurrentPage { get; private set; }
+        protected PaginationParameters? CurrentPage { get; private set; }
 
         protected ReverseChildIDFillFlowContainer<Drawable> ItemsContainer { get; private set; }
 
@@ -111,7 +111,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             loadCancellation = new CancellationTokenSource();
 
-            CurrentPage = CurrentPage?.TakeNext(ItemsPerPage) ?? new Pagination(InitialItemsCount);
+            CurrentPage = CurrentPage?.TakeNext(ItemsPerPage) ?? new PaginationParameters(InitialItemsCount);
 
             retrievalRequest = CreateRequest(CurrentPage.Value);
             retrievalRequest.Success += UpdateItems;
@@ -151,7 +151,7 @@ namespace osu.Game.Overlays.Profile.Sections
         {
         }
 
-        protected abstract APIRequest<List<TModel>> CreateRequest(Pagination pagination);
+        protected abstract APIRequest<List<TModel>> CreateRequest(PaginationParameters pagination);
 
         protected abstract Drawable CreateDrawableItem(TModel model);
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index c3a5e3f8b8..ef9f4b5ff3 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             base.OnItemsReceived(items);
         }
 
-        protected override APIRequest<List<APIScore>> CreateRequest(Pagination pagination) =>
+        protected override APIRequest<List<APIScore>> CreateRequest(PaginationParameters pagination) =>
             new GetUserScoresRequest(User.Value.Id, type, pagination);
 
         private int drawableItemIndex;
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index e5118094ce..77008d5f34 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             ItemsContainer.Spacing = new Vector2(0, 8);
         }
 
-        protected override APIRequest<List<APIRecentActivity>> CreateRequest(Pagination pagination) =>
+        protected override APIRequest<List<APIRecentActivity>> CreateRequest(PaginationParameters pagination) =>
             new GetUserRecentActivitiesRequest(User.Value.Id, pagination);
 
         protected override Drawable CreateDrawableItem(APIRecentActivity model) => new DrawableRecentActivity(model);