The audit button copies the style of the command and also fixed the imports and some other changes

Author: modwodmm

application/src/main/java/org/togetherjava/tjbot/features/moderation/ModerationUtils.java

@@ -460,8 +460,9 @@ public static List<List<ActionRecord>> groupActionsByPages(
             List<ActionRecord> moderationActions) {
         List<List<ActionRecord>> groupedModerationActions = new ArrayList<>();
 
-        for (int i = 0; i < moderationActions.size(); i++) {
-            if (i % MAX_AUDIT_PAGE_LENGTH == 0) {
+        for (int i = moderationActions.size() - 1; i >= 0; i--) {
+            if (groupedModerationActions.isEmpty()
+                    || groupedModerationActions.getLast().size() == MAX_AUDIT_PAGE_LENGTH) {
                 groupedModerationActions.add(new ArrayList<>(MAX_AUDIT_PAGE_LENGTH));
             }
             groupedModerationActions.getLast().add(moderationActions.get(i));
@@ -474,7 +475,7 @@ public static List<List<ActionRecord>> groupActionsByPages(
      * Generates a structural text overview outlining the count total of each action type.
      *
      * @param moderationActions a collection of history records
-     * @return a formatted markdown description summary
+     * @return a formatted Markdown description summary
      */
     public static String createSummaryMessageDescription(
             Collection<ActionRecord> moderationActions) {

application/src/main/java/org/togetherjava/tjbot/features/moderation/ReportCommand.java

@@ -3,7 +3,11 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
@@ -28,11 +32,13 @@
 import org.togetherjava.tjbot.features.utils.AmbientColors;
 import org.togetherjava.tjbot.features.utils.MessageUtils;
 
-import java.awt.*;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -186,8 +192,11 @@ private MessageCreateAction createModMessage(String reportReason,
             .setColor(AmbientColors.MODMAIL)
             .build();
 
-        String historyButtonId =
-                generateComponentId(Lifespan.REGULAR, reportedMessage.authorId, "0");
+        long reportedUserId = Long.parseLong(reportedMessage.authorId);
+        int startingPage = getStartingPageForUser(guild.getIdLong(), reportedUserId);
+
+        String historyButtonId = generateComponentId(Lifespan.REGULAR, reportedMessage.authorId,
+                String.valueOf(startingPage));
 
         MessageCreateAction message =
                 modMailAuditLog.sendMessageEmbeds(reportedMessageEmbed, reportReasonEmbed)
@@ -247,7 +256,11 @@ static ReportedMessage ofArgs(List<String> args) {
 
     @Override
     public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
-        event.deferReply(true).queue();
+        if (event.getMessage().isEphemeral()) {
+            event.deferEdit().queue();
+        } else {
+            event.deferReply(true).queue();
+        }
 
         Guild guild =
                 Objects.requireNonNull(event.getGuild(), "Guild cannot be null for this command.");
@@ -265,7 +278,7 @@ public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
             .retrieveUserById(reportedUserId)
             .flatMap(user -> prepareAuditEmbedTasks(event, user, actions, pages, targetPage))
             .onErrorFlatMap(_ -> event.getHook()
-                .sendMessage("Could not load audit data for this user.")
+                .editOriginal("Could not load audit data for this user.")
                 .map(_ -> null))
             .queue();
     }
@@ -277,7 +290,7 @@ private RestAction<List<MessageEmbed.Field>> prepareAuditEmbedTasks(
         EmbedBuilder auditEmbed =
                 new EmbedBuilder().setTitle("Audit log of **%s**".formatted(user.getName()))
                     .setAuthor(user.getName(), null, user.getEffectiveAvatarUrl())
-                    .setColor(Color.BLACK)
+                    .setColor(AmbientColors.MODMAIL)
                     .setDescription(ModerationUtils.createSummaryMessageDescription(actions));
 
         if (pages.isEmpty()) {
@@ -308,8 +321,7 @@ private void finalizeAndSendEmbed(ButtonInteractionEvent event, EmbedBuilder aud
         auditEmbed.clearFields();
         embedFields.forEach(auditEmbed::addField);
 
-        auditEmbed.setFooter(
-                "Page %d/%d (Most recent first)".formatted(currentPageIndex + 1, totalPages));
+        auditEmbed.setFooter("Page %d/%d".formatted(currentPageIndex + 1, totalPages));
 
         String prevButtonId = generateComponentId(Lifespan.REGULAR, String.valueOf(reportedUserId),
                 String.valueOf(currentPageIndex - 1));
@@ -327,4 +339,14 @@ private void finalizeAndSendEmbed(ButtonInteractionEvent event, EmbedBuilder aud
             .queue();
     }
 
+    private int getStartingPageForUser(long guildId, long userId) {
+        List<ActionRecord> actions = new ArrayList<>(
+                moderationActionsStore.getActionsByTargetAscending(guildId, userId));
+
+        Collections.reverse(actions);
+        List<List<ActionRecord>> pages = ModerationUtils.groupActionsByPages(actions);
+
+        return Math.max(0, pages.size() - 1);
+    }
+
 }

application/src/main/java/org/togetherjava/tjbot/features/moderation/audit/AuditCommand.java

@@ -104,7 +104,7 @@ private <R extends MessageRequest<R>> RestAction<R> auditUser(
             Supplier<R> messageBuilderSupplier, long guildId, long targetId, long callerId,
             int pageNumber, JDA jda) {
         List<ActionRecord> actions = actionsStore.getActionsByTargetAscending(guildId, targetId);
-        List<List<ActionRecord>> groupedActions = groupActionsByPages(actions);
+        List<List<ActionRecord>> groupedActions = ModerationUtils.groupActionsByPages(actions);
         int totalPages = groupedActions.size();
 
         int pageNumberInLimits;
@@ -122,10 +122,6 @@ private <R extends MessageRequest<R>> RestAction<R> auditUser(
                     pageNumberInLimits, totalPages, guildId, targetId, callerId));
     }
 
-    private static List<List<ActionRecord>> groupActionsByPages(List<ActionRecord> actions) {
-        return ModerationUtils.groupActionsByPages(actions);
-    }
-
     private static EmbedBuilder createSummaryEmbed(User user, Collection<ActionRecord> actions) {
         String avatarOrDefaultUrl = user.getEffectiveAvatarUrl();
 
@@ -144,7 +140,8 @@ private RestAction<EmbedBuilder> attachEmbedFields(EmbedBuilder auditEmbed,
 
         List<RestAction<MessageEmbed.Field>> embedFieldTasks = new ArrayList<>();
         groupedActions.get(pageNumber - 1)
-            .forEach(action -> embedFieldTasks.add(actionToField(action, jda)));
+            .forEach(action -> embedFieldTasks
+                .add(ModerationUtils.moderationActionToEmbedField(action, jda)));
 
         return RestAction.allOf(embedFieldTasks).map(embedFields -> {
             embedFields.forEach(auditEmbed::addField);
@@ -154,10 +151,6 @@ private RestAction<EmbedBuilder> attachEmbedFields(EmbedBuilder auditEmbed,
         });
     }
 
-    private static RestAction<MessageEmbed.Field> actionToField(ActionRecord action, JDA jda) {
-        return ModerationUtils.moderationActionToEmbedField(action, jda);
-    }
-
     private <R extends MessageRequest<R>> R attachPageTurnButtons(
             Supplier<R> messageBuilderSupplier, EmbedBuilder auditEmbed, int pageNumber,
             int totalPages, long guildId, long targetId, long callerId) {