Made requested changes and made the audit message ephemeral

Author: modwodmm

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

@@ -52,6 +52,10 @@ private ModerationUtils() {
      * {@link AuditableRestAction#reason(String)}.
      */
     private static final int REASON_MAX_LENGTH = 512;
+    /**
+     * The maximum amount of moderation actions displayed on a single page
+     */
+    private static final int MAX_PAGE_LENGTH = 10;
     /**
      * Human-readable text representing the duration of a permanent action, will be shown to the
      * user as option for selection.
@@ -458,11 +462,10 @@ record TemporaryData(Instant expiresAt, String duration) {
      */
     public static List<List<ActionRecord>> groupActionsByPages(List<ActionRecord> actions) {
         List<List<ActionRecord>> groupedActions = new ArrayList<>();
-        final int maxPageLength = 10;
 
         for (int i = 0; i < actions.size(); i++) {
-            if (i % maxPageLength == 0) {
-                groupedActions.add(new ArrayList<>(maxPageLength));
+            if (i % MAX_PAGE_LENGTH == 0) {
+                groupedActions.add(new ArrayList<>(MAX_PAGE_LENGTH));
             }
             groupedActions.getLast().add(actions.get(i));
         }
@@ -503,29 +506,31 @@ public static String createSummaryMessageDescription(Collection<ActionRecord> ac
     /**
      * Converts an action record item asynchronously into a formatted embed data field.
      *
-     * @param action the record data item
+     * @param actionRecord the moderation action history record to convert
      * @param jda the active JDA instance used to resolve the moderator's handle
-     * @return a field representation task mapping out the execution card detail
+     * @return a rest action that resolves to the embed field representing the moderation action
      */
-    public static RestAction<MessageEmbed.Field> actionToField(ActionRecord action, JDA jda) {
-        return jda.retrieveUserById(action.authorId())
+    public static RestAction<MessageEmbed.Field> actionToEmbedField(ActionRecord actionRecord,
+            JDA jda) {
+        return jda.retrieveUserById(actionRecord.authorId())
             .map(author -> author == null ? "(unknown user)" : author.getName())
             .map(authorText -> {
-                String expiresAtFormatted = action.actionExpiresAt() == null ? ""
-                        : "\nTemporary action, expires at: " + net.dv8tion.jda.api.utils.TimeUtil
-                            .getDateTimeString(action.actionExpiresAt().atOffset(ZoneOffset.UTC));
-
-                String fieldName = "%s by %s".formatted(action.actionType().name(), authorText);
-                String fieldDescription =
-                        """
-                                %s
-                                Issued at: %s%s
-                                """.formatted(action.reason(),
-                                net.dv8tion.jda.api.utils.TimeUtil
-                                    .getDateTimeString(action.issuedAt().atOffset(ZoneOffset.UTC)),
-                                expiresAtFormatted);
-
-                return new MessageEmbed.Field(fieldName, fieldDescription, false);
+                String expiresAtFormatted = actionRecord.actionExpiresAt() == null ? ""
+                        : "\nTemporary action, expires at: "
+                                + net.dv8tion.jda.api.utils.TimeUtil.getDateTimeString(
+                                        actionRecord.actionExpiresAt().atOffset(ZoneOffset.UTC));
+
+                String embedFieldName =
+                        "%s by %s".formatted(actionRecord.actionType().name(), authorText);
+                String embedFieldDescription = """
+                        %s
+                        Issued at: %s%s
+                        """.formatted(actionRecord.reason(),
+                        net.dv8tion.jda.api.utils.TimeUtil
+                            .getDateTimeString(actionRecord.issuedAt().atOffset(ZoneOffset.UTC)),
+                        expiresAtFormatted);
+
+                return new MessageEmbed.Field(embedFieldName, embedFieldDescription, false);
             });
     }
 

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

@@ -30,10 +30,7 @@
 import java.awt.Color;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -249,7 +246,7 @@ static ReportedMessage ofArgs(List<String> args) {
 
     @Override
     public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
-        event.deferEdit().queue();
+        event.deferReply(true).queue();
 
         Guild guild =
                 Objects.requireNonNull(event.getGuild(), "Guild cannot be null for this command.");
@@ -258,7 +255,7 @@ public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
         long reportedUserId = Long.parseLong(args.get(0));
         int targetPage = Integer.parseInt(args.get(1));
 
-        List<ActionRecord> actions = new java.util.ArrayList<>(
+        List<ActionRecord> actions = new ArrayList<>(
                 moderationActionsStore.getActionsByTargetAscending(guildId, reportedUserId));
         Collections.reverse(actions);
         List<List<ActionRecord>> pages = ModerationUtils.groupActionsByPages(actions);
@@ -293,7 +290,7 @@ private RestAction<List<MessageEmbed.Field>> prepareAuditEmbedTasks(
 
         List<RestAction<MessageEmbed.Field>> fetchFieldActions = pages.get(currentPageIndex)
             .stream()
-            .map(action -> ModerationUtils.actionToField(action, event.getJDA()))
+            .map(actionRecord -> ModerationUtils.actionToEmbedField(actionRecord, event.getJDA()))
             .toList();
 
         return RestAction.allOf(fetchFieldActions).map(embedFields -> {

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

@@ -152,7 +152,7 @@ private RestAction<EmbedBuilder> attachEmbedFields(EmbedBuilder auditEmbed,
     }
 
     private static RestAction<MessageEmbed.Field> actionToField(ActionRecord action, JDA jda) {
-        return ModerationUtils.actionToField(action, jda);
+        return ModerationUtils.actionToEmbedField(action, jda);
     }
 
     private <R extends MessageRequest<R>> R attachPageTurnButtons(