Skip to content

feat: preserve flags in /sponsor maps pagination #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
applenick merged 1 commit into from
Aug 28, 2026
Merged

feat: preserve flags in /sponsor maps pagination #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions core/src/main/java/dev/pgm/community/requests/commands/sponsor/SponsorCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import dev.pgm.community.utils.PGMUtils.MapSizeBounds;
import dev.pgm.community.utils.PaginatedComponentResults;
import dev.pgm.community.utils.VisibilityUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
Expand Down Expand Up @@ -205,10 +206,15 @@ public void viewMapList(
@Flag(value = "author", aliases = "a") String author,
@Flag(value = "name", aliases = "n") String name) {
Stream<MapInfo> search = requests.getAvailableSponsorMaps().stream();
List<String> paginationArgs = new ArrayList<>();
paginationArgs.add("/sponsor maps");

if (name != null) {
String query = StringUtils.normalize(name);
search = search.filter(map -> LiquidMetal.match(map.getNormalizedName(), query));

paginationArgs.add("--name");
paginationArgs.add(name);
}

if (!tags.isEmpty()) {
Expand All @@ -221,11 +227,17 @@ public void viewMapList(
Collectors.mapping(
(String s) -> s.startsWith("!") ? s.substring(1) : s, Collectors.toSet())));
search = search.filter(map -> matchesTags(map, tagSet.get(false), tagSet.get(true)));

paginationArgs.add("--tags");
paginationArgs.add(String.join(",", tags));
}

if (author != null) {
String query = StringUtils.normalize(author);
search = search.filter(map -> matchesAuthor(map, query));

paginationArgs.add("--author");
paginationArgs.add(author);
}

Set<MapInfo> maps = search.collect(Collectors.toCollection(TreeSet::new));
Expand Down Expand Up @@ -278,6 +290,7 @@ public Component formatEmpty() {

// Add page button when more than 1 page
if (pages > 1) {
String command = String.join(" ", paginationArgs);
TextComponent.Builder buttons = text();

if (page > 1) {
Expand All @@ -286,7 +299,7 @@ public Component formatEmpty() {
.append(text(" Previous Page", NamedTextColor.BLUE))
.hoverEvent(
HoverEvent.showText(text("Click to view previous page", NamedTextColor.GRAY)))
.clickEvent(ClickEvent.runCommand("/sponsor maps " + (page - 1))));
.clickEvent(ClickEvent.runCommand(command + " " + (page - 1))));
}

if (page > 1 && page < pages) {
Expand All @@ -298,7 +311,7 @@ public Component formatEmpty() {
.append(text("Next Page ", NamedTextColor.BLUE))
.append(BroadcastUtils.RIGHT_DIV.color(NamedTextColor.GOLD))
.hoverEvent(HoverEvent.showText(text("Click to view next page", NamedTextColor.GRAY)))
.clickEvent(ClickEvent.runCommand("/sponsor maps " + (page + 1))));
.clickEvent(ClickEvent.runCommand(command + " " + (page + 1))));
}
audience.sendMessage(TextFormatter.horizontalLineHeading(
audience.getSender(), buttons.build(), NamedTextColor.DARK_PURPLE, 250));
Expand Down