refactor: address review feedback

Author: Neil-Tomar

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

@@ -28,7 +28,7 @@
 @AutoDetectableComponentHandler(FormatCodeInteractionHandler.COMPONENT_ID)
 @RequiredArgsConstructor
 public class FormatCodeInteractionHandler implements ButtonHandler, StringSelectMenuHandler {
-	static final String COMPONENT_ID = "format-code-delete";
+	static final String COMPONENT_ID = "format-code";
 	private final BotConfig botConfig;
 
 	/**
@@ -39,7 +39,7 @@ public class FormatCodeInteractionHandler implements ButtonHandler, StringSelect
 	 * @return the delete-all button
 	 */
 	public static Button createDeleteAllButton(long requesterID, int total){
-		return Button.secondary(ComponentIdBuilder.build(COMPONENT_ID,requesterID,total),"\uD83D\uDDD1️");
+		return Button.secondary(ComponentIdBuilder.build(COMPONENT_ID,requesterID,total),"\uD83D\uDDD1\uFE0F");
 	}
 
 	private static StringSelectMenu languageMenu(String customId) {
@@ -64,7 +64,7 @@ public static ActionRow buildLanguageMenu(long requesterId, int total) {
 	}
 
 	@Override
-	public void handleButton(ButtonInteractionEvent event, Button button) {
+	public void handleButton(ButtonInteractionEvent event, @NonNull Button button) {
 		String[] id = ComponentIdBuilder.split(event.getComponentId());
 		long requesterId = Long.parseLong(id[1]);
 
@@ -80,13 +80,14 @@ public void handleButton(ButtonInteractionEvent event, Button button) {
 		}
 
 		event.deferEdit().queue();
-		var channel = event.getChannel();
-		LinkedMessages.resolve(channel, event.getMessage(), Integer.parseInt(id[2]),
-				messages -> messages.forEach(message -> message.delete().queue()));
+
+		LinkedMessages.resolveBefore(event.getMessage(), Integer.parseInt(id[2]),
+				messages -> event.getChannel().purgeMessages(messages),
+				() -> Responses.error(event.getHook(),"Could not delete the code block"));
 	}
 
 	@Override
-		public void handleStringSelectMenu(@NonNull StringSelectInteractionEvent event, @NonNull List<String> values) {
+	public void handleStringSelectMenu(@NonNull StringSelectInteractionEvent event, @NonNull List<String> values) {
 		String[] id = ComponentIdBuilder.split(event.getComponentId());
 		long requesterId = Long.parseLong(id[1]);
 
@@ -103,9 +104,10 @@ public void handleStringSelectMenu(@NonNull StringSelectInteractionEvent event,
 		Language language = Language.fromString(values.getFirst());
 		event.deferEdit().queue();
 
-		LinkedMessages.resolveForward(event.getChannel(), event.getMessage(), Integer.parseInt(id[2]),
+		LinkedMessages.resolveAfter(event.getMessage(), Integer.parseInt(id[2]),
 				messages -> messages.forEach(message ->
-						message.editMessage(withLanguage(message.getContentRaw(), language)).queue()));
+						message.editMessage(withLanguage(message.getContentRaw(), language)).queue()),
+						() -> Responses.error(event.getHook(),"Could not update the code block"));
 	}
 
 	private boolean canManage(Member member, long requesterId) {

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

@@ -1,7 +1,6 @@
 package net.discordjug.javabot.systems.user_commands.format_code;
 
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,43 +17,53 @@ private LinkedMessages(){}
 
 	/**
 	 * Resolves the block ending at {@code triggerMessage} (walking back {@code total} messages) and
-	 * passes the bot's own messages among them to {@code onResolved}.
+	 * passes the bot's own messages to {@code onResolved}, or runs {@code onError} if it can't be
+	 * safely resolved.
 	 *
-	 * @param channel        the channel the block is in
 	 * @param triggerMessage the last message of the block (carries the component)
 	 * @param total          the number of messages in the block
-	 * @param onResolved      receives the bot's messages that make up the block
+	 * @param onResolved     receives the bot's messages that make up the block
+	 * @param onError        runs if the block can't be safely resolved
 	 */
-	static void resolve(MessageChannel channel, Message triggerMessage, int total, Consumer<List<Message>> onResolved) {
+	static void resolveBefore(Message triggerMessage, int total, Consumer<List<Message>> onResolved, Runnable onError) {
 		if (total <= 1) {
-			onResolved.accept(List.of(triggerMessage));
+			verify(List.of(triggerMessage), total, onResolved, onError);
 			return;
 		}
-		channel.getHistoryBefore(triggerMessage.getIdLong(), total - 1).queue(history -> {
+		triggerMessage.getChannel().getHistoryBefore(triggerMessage.getIdLong(), total - 1).queue(history -> {
 			List<Message> block = new ArrayList<>(history.getRetrievedHistory());
 			block.add(triggerMessage);
-			onResolved.accept(onlyOwn(channel, block));
+			verify(block, total, onResolved, onError);
 		});
 	}
 
 	/**
 	 * Resolves the block of {@code total} messages sent after {@code anchorMessage} and passes the
-	 * bot's own messages among them to {@code onResolved}.
+	 * bot's own messages to {@code onResolved}, or runs {@code onError} if it can't be safely resolved.
 	 *
-	 * @param channel       the channel the block is in
 	 * @param anchorMessage the message just before the block (carries the component)
 	 * @param total         the number of messages in the block
-	 * @param onResolved     receives the bot's messages that make up the block
+	 * @param onResolved    receives the bot's messages that make up the block
+	 * @param onError       runs if the block can't be safely resolved
 	 */
-	static void resolveForward(MessageChannel channel, Message anchorMessage, int total, Consumer<List<Message>> onResolved) {
-		channel.getHistoryAfter(anchorMessage.getIdLong(), total).queue(history ->
-				onResolved.accept(onlyOwn(channel, history.getRetrievedHistory())));
+	static void resolveAfter(Message anchorMessage, int total, Consumer<List<Message>> onResolved, Runnable onError) {
+		anchorMessage.getChannel().getHistoryAfter(anchorMessage.getIdLong(), total).queue(history ->
+				verify(history.getRetrievedHistory(), total, onResolved, onError));
+	}
+
+	private static void verify(List<Message> messages, int total, Consumer<List<Message>> onResolved, Runnable onError) {
+		List<Message> own = onlyOwn(messages);
+		boolean allCodeBlocks = own.stream().allMatch(message -> message.getContentRaw().startsWith("```"));
+		if (own.size() != total || !allCodeBlocks) {
+			onError.run();
+			return;
+		}
+		onResolved.accept(own);
 	}
 
-	private static List<Message> onlyOwn(MessageChannel channel, List<Message> messages) {
-		long selfId = channel.getJDA().getSelfUser().getIdLong();
+	private static List<Message> onlyOwn(List<Message> messages) {
 		return messages.stream()
-				.filter(message -> message.getAuthor().getIdLong() == selfId)
+				.filter(message -> message.getAuthor().getIdLong() == message.getJDA().getSelfUser().getIdLong())
 				.toList();
 	}
 }

src/main/java/net/discordjug/javabot/util/InteractionUtils.java

@@ -116,7 +116,7 @@ private boolean canDeleteUsingButton(Member member, String[] componentId) {
 	}
 
 	public static Button createDeleteButton(long senderId) {
-		return Button.secondary(createDeleteInteractionId(senderId), "\uD83D\uDDD1️");
+		return Button.secondary(createDeleteInteractionId(senderId), "\uD83D\uDDD1\uFE0F");
 	}
 
 	public static String createDeleteInteractionId(long senderId) {