Fix page number validation in log commands (#4296)

This commit is contained in:
Emir authored and GitHub committed 2026-08-13 21:18:50 +01:00
1 parent 2dfd387882
commit f6bcb1676e
5 files changed
+37 -14

No files matched your search

@@ -59,10 +59,14 @@ public class LogGroupHistory extends ChildCommand<Void> {
return;
}
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, args.getIntOrDefault(1, 1));
LogPage log = plugin.getStorage().getLogPage(ActionFilters.group(group), pageParams).join();
int page = args.getIntOrDefault(1, 1);
if (page < 1) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, 1);
return;
}
int page = pageParams.pageNumber();
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page);
LogPage log = plugin.getStorage().getLogPage(ActionFilters.group(group), pageParams).join();
int maxPage = pageParams.getMaxPage(log.getTotalEntries());
if (log.getTotalEntries() == 0) {
@@ -70,7 +74,7 @@ public class LogGroupHistory extends ChildCommand<Void> {
return;
}
if (page < 1 || page > maxPage) {
if (page > maxPage) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage);
return;
}
@@ -70,6 +70,11 @@ public class LogRecent extends ChildCommand<Void> {
}
}
if (page < 1) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, 1);
return;
}
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page);
LogPage log = plugin.getStorage().getLogPage(uuid == null ? ActionFilters.all() : ActionFilters.source(uuid), pageParams).join();
@@ -79,7 +84,7 @@ public class LogRecent extends ChildCommand<Void> {
return;
}
if (page < 1 || page > maxPage) {
if (page > maxPage) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage);
return;
}
@@ -60,6 +60,12 @@ public class LogSearch extends ChildCommand<Void> {
}
final String query = String.join(" ", args);
if (page < 1) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, 1);
return;
}
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page);
LogPage log = plugin.getStorage().getLogPage(ActionFilters.search(query), pageParams).join();
@@ -69,7 +75,7 @@ public class LogSearch extends ChildCommand<Void> {
return;
}
if (page < 1 || page > maxPage) {
if (page > maxPage) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage);
return;
}
@@ -58,10 +58,14 @@ public class LogTrackHistory extends ChildCommand<Void> {
Message.TRACK_INVALID_ENTRY.send(sender, track);
return;
}
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, args.getIntOrDefault(1, 1));
LogPage log = plugin.getStorage().getLogPage(ActionFilters.track(track), pageParams).join();
int page = args.getIntOrDefault(1, 1);
if (page < 1) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, 1);
return;
}
int page = pageParams.pageNumber();
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page);
LogPage log = plugin.getStorage().getLogPage(ActionFilters.track(track), pageParams).join();
int maxPage = pageParams.getMaxPage(log.getTotalEntries());
if (log.getTotalEntries() == 0) {
@@ -69,7 +73,7 @@ public class LogTrackHistory extends ChildCommand<Void> {
return;
}
if (page < 1 || page > maxPage) {
if (page > maxPage) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage);
return;
}
@@ -55,10 +55,14 @@ public class LogUserHistory extends ChildCommand<Void> {
return;
}
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, args.getIntOrDefault(1, 1));
LogPage log = plugin.getStorage().getLogPage(ActionFilters.user(uuid), pageParams).join();
int page = args.getIntOrDefault(1, 1);
if (page < 1) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, 1);
return;
}
int page = pageParams.pageNumber();
PageParameters pageParams = new PageParameters(ENTRIES_PER_PAGE, page);
LogPage log = plugin.getStorage().getLogPage(ActionFilters.user(uuid), pageParams).join();
int maxPage = pageParams.getMaxPage(log.getTotalEntries());
if (log.getTotalEntries() == 0) {
@@ -66,7 +70,7 @@ public class LogUserHistory extends ChildCommand<Void> {
return;
}
if (page < 1 || page > maxPage) {
if (page > maxPage) {
Message.LOG_INVALID_PAGE_RANGE.send(sender, maxPage);
return;
}