h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-05 20:42:55 +08:00
Code Issues Releases Wiki Activity

Simplify offset calculation

Browse Source
This commit is contained in:
smoogipoo 2019-07-19 16:02:33 +09:00
parent 2a66cf36d5
commit 066bee3535
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
View File

@ -13,8 +13,8 @@ namespace osu.Game.Online.API.Requests
private readonly BeatmapSetType type; private readonly BeatmapSetType type;
public GetUserBeatmapsRequest(long userId, BeatmapSetType type, int offset = 0, int limit = 6) public GetUserBeatmapsRequest(long userId, BeatmapSetType type, int page = 0, int itemsPerPage = 6)
: base(offset, limit) : base(page, itemsPerPage)
{ {
this.userId = userId; this.userId = userId;
this.type = type; this.type = type;

4
osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
View File

@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
{ {
private readonly long userId; private readonly long userId;
public GetUserMostPlayedBeatmapsRequest(long userId, int offset = 0, int limit = 5) public GetUserMostPlayedBeatmapsRequest(long userId, int page = 0, int itemsPerPage = 5)
: base(offset, limit) : base(page, itemsPerPage)
{ {
this.userId = userId; this.userId = userId;
} }

4
osu.Game/Online/API/Requests/GetUserRecentActivitiesRequest.cs
View File

@ -10,8 +10,8 @@ namespace osu.Game.Online.API.Requests
{ {
private readonly long userId; private readonly long userId;
public GetUserRecentActivitiesRequest(long userId, int offset = 0, int limit = 5) public GetUserRecentActivitiesRequest(long userId, int page = 0, int itemsPerPage = 5)
: base(offset, limit) : base(page, itemsPerPage)
{ {
this.userId = userId; this.userId = userId;
} }

4
osu.Game/Online/API/Requests/GetUserScoresRequest.cs
View File

@ -11,8 +11,8 @@ namespace osu.Game.Online.API.Requests
private readonly long userId; private readonly long userId;
private readonly ScoreType type; private readonly ScoreType type;
public GetUserScoresRequest(long userId, ScoreType type, int offset = 0, int limit = 5) public GetUserScoresRequest(long userId, ScoreType type, int page = 0, int itemsPerPage = 5)
: base(offset, limit) : base(page, itemsPerPage)
{ {
this.userId = userId; this.userId = userId;
this.type = type; this.type = type;

14
osu.Game/Online/API/Requests/PaginatedAPIRequest.cs
View File

@ -8,21 +8,21 @@ namespace osu.Game.Online.API.Requests
{ {
public abstract class PaginatedAPIRequest<T> : APIRequest<T> public abstract class PaginatedAPIRequest<T> : APIRequest<T>
{ {
private readonly int offset; private readonly int page;
private readonly int limit; private readonly int itemsPerPage;
protected PaginatedAPIRequest(int offset, int limit) protected PaginatedAPIRequest(int page, int itemsPerPage)
{ {
this.offset = offset; this.page = page;
this.limit = limit; this.itemsPerPage = itemsPerPage;
} }
protected override WebRequest CreateWebRequest() protected override WebRequest CreateWebRequest()
{ {
var req = base.CreateWebRequest(); var req = base.CreateWebRequest();
req.AddParameter("offset", offset.ToString(CultureInfo.InvariantCulture)); req.AddParameter("offset", (page * itemsPerPage).ToString(CultureInfo.InvariantCulture));
req.AddParameter("limit", limit.ToString(CultureInfo.InvariantCulture)); req.AddParameter("limit", itemsPerPage.ToString(CultureInfo.InvariantCulture));
return req; return req;
} }

2
osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
protected override void ShowMore() protected override void ShowMore()
{ {
request = new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++ * ItemsPerPage, ItemsPerPage); request = new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
request.Success += sets => Schedule(() => request.Success += sets => Schedule(() =>
{ {
MoreButton.FadeTo(sets.Count == ItemsPerPage ? 1 : 0); MoreButton.FadeTo(sets.Count == ItemsPerPage ? 1 : 0);

2
osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
protected override void ShowMore() protected override void ShowMore()
{ {
request = new GetUserMostPlayedBeatmapsRequest(User.Value.Id, VisiblePages++ * ItemsPerPage, ItemsPerPage); request = new GetUserMostPlayedBeatmapsRequest(User.Value.Id, VisiblePages++, ItemsPerPage);
request.Success += beatmaps => Schedule(() => request.Success += beatmaps => Schedule(() =>
{ {
MoreButton.FadeTo(beatmaps.Count == ItemsPerPage ? 1 : 0); MoreButton.FadeTo(beatmaps.Count == ItemsPerPage ? 1 : 0);

2
osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
protected override void ShowMore() protected override void ShowMore()
{ {
request = new GetUserScoresRequest(User.Value.Id, type, VisiblePages++ * ItemsPerPage, ItemsPerPage); request = new GetUserScoresRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
request.Success += scores => Schedule(() => request.Success += scores => Schedule(() =>
{ {
foreach (var s in scores) foreach (var s in scores)

2
osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
protected override void ShowMore() protected override void ShowMore()
{ {
request = new GetUserRecentActivitiesRequest(User.Value.Id, VisiblePages++ * ItemsPerPage, ItemsPerPage); request = new GetUserRecentActivitiesRequest(User.Value.Id, VisiblePages++, ItemsPerPage);
request.Success += activities => Schedule(() => request.Success += activities => Schedule(() =>
{ {
MoreButton.FadeTo(activities.Count == ItemsPerPage ? 1 : 0); MoreButton.FadeTo(activities.Count == ItemsPerPage ? 1 : 0);