refactor: address format-code review feedback

Author: Neil-Tomar

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/Code.java

@@ -15,7 +15,7 @@ public class Code {
 	 */
 	private static final int MAX_SIZE = 1980;
 
-	private Language language;
+	private final Language language;
 	private final String content;
 
 	/**

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeCommand.java

@@ -2,16 +2,14 @@
 
 import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;
 import net.discordjug.javabot.util.*;
-import net.dv8tion.jda.api.components.actionrow.ActionRow;
-import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionContextType;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import org.jetbrains.annotations.Contract;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -53,19 +51,6 @@ private static OptionData formatOption() {
 		return option;
 	}
 
-	/**
-	 * Builds the action row placed on the file-upload message: a delete button and a "View Original" link.
-	 *
-	 * @param target      the original message linked by the "View Original" button
-	 * @param requesterId the id of the user permitted to delete the message
-	 * @return an action row containing the delete and "View Original" buttons
-	 */
-	@Contract("_ -> new")
-	static @NotNull ActionRow buildActionRow(@NotNull Message target, long requesterId) {
-		return ActionRow.of(InteractionUtils.createDeleteButton(requesterId),
-				Button.link(target.getJumpUrl(), "View Original"));
-	}
-
 	@Override
 	public void execute(@NotNull SlashCommandInteractionEvent event) {
 		OptionMapping idOption = event.getOption("message-id");
@@ -83,18 +68,18 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 						if (target != null) {
 							sendFormattedCode(event, target, language, indentation);
 						} else {
-							Responses.error(event.getHook(), "Could not find message; please specify a message id.").queue();
+							Responses.error(event, "Could not find message; please specify a message id.").queue();
 						}
 					});
 		} else {
 			if (Checks.isInvalidLongInput(idOption)) {
-				Responses.error(event.getHook(), "Please provide a valid message id!").queue();
+				Responses.error(event, "Please provide a valid message id!").queue();
 				return;
 			}
 			long messageId = idOption.getAsLong();
 			event.getChannel().retrieveMessageById(messageId).queue(
 					target -> sendFormattedCode(event, target, language, indentation),
-					e -> Responses.error(event.getHook(), "Could not retrieve message with id: " + messageId).queue());
+					e -> Responses.error(event, "Could not retrieve message with id: " + messageId).queue());
 		}
 	}
 

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeDispatcher.java

@@ -19,7 +19,7 @@
  * downloadable file, then posts it as one or more ordered code-block messages that each respect
  * Discord's 2000-character limit.
  */
-public class FormatCodeDispatcher {
+class FormatCodeDispatcher {
 
 	/**
 	 * Acknowledges the interaction by replying with the full code as a file, then posts the code as
@@ -32,10 +32,10 @@ public class FormatCodeDispatcher {
 	 */
 	public static void sendCode(Code code, @Nonnull CommandInteraction event, Message target){
 		if (code.getContent().isBlank()) {
-			Responses.error(event.getHook(), "There is no code to format in that message.").queue();
+			Responses.error(event, "There is no code to format in that message.").queue();
 			return;
 		}
-		// Currently we always format as Java. A language dropdown will be added in the future.
+
 		List<String> messages = code.toDiscordMessages();
 
 		// The reply both acknowledges the interaction and hands users the full,
@@ -49,7 +49,7 @@ public static void sendCode(Code code, @Nonnull CommandInteraction event, Messag
 
 		event.replyFiles(file)
 				.setAllowedMentions(List.of())
-				.setComponents(FormatCodeCommand.buildActionRow(target, event.getUser().getIdLong()))
+				.setComponents(buildActionRow(target, event.getUser().getIdLong()))
 				.queue(success -> sendChunksInOrder(channel, messages, 0, target,event));
 	}
 
@@ -62,7 +62,11 @@ private static void sendChunksInOrder(MessageChannel channel, List<String> messa
 				.setAllowedMentions(List.of());
 
 		if (index == messages.size() - 1) {
-			action.setComponents(buildActionRow(target, event.getUser().getIdLong()));
+			if(index == 0){
+				action.setComponents(buildActionRow(target, event.getUser().getIdLong()));
+			} else {
+				action.setComponents(buildActionRow(target));
+			}
 		}
 
 		action.queue(success ->
@@ -73,11 +77,23 @@ private static void sendChunksInOrder(MessageChannel channel, List<String> messa
 	 * Builds the action row placed on the last code-block message.
 	 *
 	 * @param target      the original message linked by the "View Original" button
-	 * @param requesterId the id of the requesting user
 	 * @return an action row containing the "View Original" link button
 	 */
 	@Contract("_ -> new")
-	static @NotNull ActionRow buildActionRow(@NotNull Message target, long requesterId) {
+	static @NotNull ActionRow buildActionRow(@NotNull Message target) {
 		return ActionRow.of(Button.link(target.getJumpUrl(), "View Original"));
 	}
+
+	/**
+	 * Builds the action row placed on the file-upload message: a delete button and a "View Original" link.
+	 *
+	 * @param target      the original message linked by the "View Original" button
+	 * @param requesterId the id of the user permitted to delete the message
+	 * @return an action row containing the delete and "View Original" buttons
+	 */
+	@Contract("_ -> new")
+	static @NotNull ActionRow buildActionRow(@NotNull Message target, long requesterId) {
+		return ActionRow.of(InteractionUtils.createDeleteButton(requesterId),
+				Button.link(target.getJumpUrl(), "View Original"));
+	}
 }