Used helper methods so the code is easier to understand

Author: modwodmm

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

@@ -262,62 +262,73 @@ public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
 
         List<ActionRecord> actions = new java.util.ArrayList<>(
                 moderationActionsStore.getActionsByTargetAscending(guildId, reportedUserId));
-
         Collections.reverse(actions);
         List<List<ActionRecord>> pages = ModerationUtils.groupActionsByPages(actions);
 
-        event.getJDA().retrieveUserById(reportedUserId).queue(user -> {
-            EmbedBuilder auditEmbed =
-                    new EmbedBuilder().setTitle("Audit log of **%s**".formatted(user.getName()))
-                        .setAuthor(user.getName(), null, user.getEffectiveAvatarUrl())
-                        .setColor(Color.BLACK)
-                        .setDescription(ModerationUtils.createSummaryMessageDescription(actions));
-
-            if (pages.isEmpty()) {
-                event.getHook()
-                    .editOriginalEmbeds(auditEmbed.build())
-                    .setComponents(Collections.emptyList())
-                    .queue();
-                return;
-            }
-
-            int currentPageIndex = Math.clamp(targetPage, 0, pages.size() - 1);
-
-            List<net.dv8tion.jda.api.requests.RestAction<MessageEmbed.Field>> fieldTasks =
-                    pages.get(currentPageIndex)
-                        .stream()
-                        .map(action -> ModerationUtils.actionToField(action, event.getJDA()))
-                        .toList();
-
-            net.dv8tion.jda.api.requests.RestAction.allOf(fieldTasks).queue(fields -> {
-                auditEmbed.clearFields();
-                fields.forEach(auditEmbed::addField);
-
-                auditEmbed.setFooter("Page %d/%d (Most recent first)"
-                    .formatted(currentPageIndex + 1, pages.size()));
-
-                String prevButtonId = generateComponentId(Lifespan.REGULAR,
-                        String.valueOf(reportedUserId), String.valueOf(currentPageIndex - 1));
-                String nextButtonId = generateComponentId(Lifespan.REGULAR,
-                        String.valueOf(reportedUserId), String.valueOf(currentPageIndex + 1));
-
-                Button prevButton = Button.primary(prevButtonId, "◀ Previous")
-                    .withDisabled(currentPageIndex == 0);
-
-                Button nextButton = Button.primary(nextButtonId, "Next ▶")
-                    .withDisabled(currentPageIndex == pages.size() - 1);
-
-                event.getHook()
-                    .editOriginalEmbeds(auditEmbed.build())
-                    .setActionRow(prevButton, nextButton)
-                    .queue();
-
-            }, _ -> event.getHook()
-                .sendMessage("Could not load moderation history fields.")
-                .queue());
-        }, _ -> event.getHook()
-            .sendMessage("Could not retrieve audit data for this user.")
-            .queue());
+        event.getJDA()
+            .retrieveUserById(reportedUserId)
+            .queue(user -> renderAuditEmbed(event, user, actions, pages, targetPage),
+                    _ -> event.getHook()
+                        .sendMessage("Could not retrieve audit data for this user.")
+                        .queue());
+    }
+
+    private void renderAuditEmbed(ButtonInteractionEvent event,
+            net.dv8tion.jda.api.entities.User user, List<ActionRecord> actions,
+            List<List<ActionRecord>> pages, int targetPage) {
+        EmbedBuilder auditEmbed =
+                new EmbedBuilder().setTitle("Audit log of **%s**".formatted(user.getName()))
+                    .setAuthor(user.getName(), null, user.getEffectiveAvatarUrl())
+                    .setColor(Color.BLACK)
+                    .setDescription(ModerationUtils.createSummaryMessageDescription(actions));
+
+        if (pages.isEmpty()) {
+            event.getHook()
+                .editOriginalEmbeds(auditEmbed.build())
+                .setComponents(Collections.emptyList())
+                .queue();
+            return;
+        }
+
+        int currentPageIndex = Math.clamp(targetPage, 0, pages.size() - 1);
+
+        List<net.dv8tion.jda.api.requests.RestAction<MessageEmbed.Field>> fieldTasks =
+                pages.get(currentPageIndex)
+                    .stream()
+                    .map(action -> ModerationUtils.actionToField(action, event.getJDA()))
+                    .toList();
+
+        net.dv8tion.jda.api.requests.RestAction.allOf(fieldTasks)
+            .queue(fields -> finalizeAndSendEmbed(event, auditEmbed, fields, user.getIdLong(),
+                    currentPageIndex, pages.size()),
+                    _ -> event.getHook()
+                        .sendMessage("Could not load moderation history fields.")
+                        .queue());
+    }
+
+    private void finalizeAndSendEmbed(ButtonInteractionEvent event, EmbedBuilder auditEmbed,
+            List<MessageEmbed.Field> fields, long reportedUserId, int currentPageIndex,
+            int totalPages) {
+        auditEmbed.clearFields();
+        fields.forEach(auditEmbed::addField);
+
+        auditEmbed.setFooter(
+                "Page %d/%d (Most recent first)".formatted(currentPageIndex + 1, totalPages));
+
+        String prevButtonId = generateComponentId(Lifespan.REGULAR, String.valueOf(reportedUserId),
+                String.valueOf(currentPageIndex - 1));
+        String nextButtonId = generateComponentId(Lifespan.REGULAR, String.valueOf(reportedUserId),
+                String.valueOf(currentPageIndex + 1));
+
+        Button prevButton =
+                Button.primary(prevButtonId, "◀ Previous").withDisabled(currentPageIndex == 0);
+        Button nextButton = Button.primary(nextButtonId, "Next ▶")
+            .withDisabled(currentPageIndex == totalPages - 1);
+
+        event.getHook()
+            .editOriginalEmbeds(auditEmbed.build())
+            .setActionRow(prevButton, nextButton)
+            .queue();
     }
 
 }