fixed issues with approach 2

Author: Neil-Tomar

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

@@ -33,9 +33,9 @@ class FormatCodeDispatcher {
 	 * @param target the original message the code came from, used for the channel and the
 	 *               "View Original" / delete buttons
 	 */
-	public static void sendCode(Code code, @Nonnull CommandInteraction event, Message target){
+	public static void sendCode(Code code, @Nonnull CommandInteraction event, Message target) {
 		if (code.getContent().isBlank()) {
-			Responses.errorWithTitle(event.getHook(), "404 Code not found","There is no code to format in that message.").queue();
+			Responses.errorWithTitle(event.getHook(), "404 Code not found", "There is no code to format in that message.").queue();
 			return;
 		}
 
@@ -44,20 +44,21 @@ public static void sendCode(Code code, @Nonnull CommandInteraction event, Messag
 		MessageChannel channel = target.getChannel();
 
 		if (messages.size() > MAX_MESSAGES) {
-			Responses.errorWithTitle(event.getHook(), "Output Too Large", "The formatted result is too large to send. Please provide a smaller code snippet or use a paste service instead."
+			Responses.errorWithTitle(event.getHook(), "Code out of Bound", "The formatted result is too large to send. Please provide a smaller code snippet or use a paste service instead."
 			).queue();
 			return;
 		}
 
-		event.getHook().sendMessage("Your message has been formatted. If needed, you can change the language used for syntax highlighting below.")
-				.setEphemeral(true)
-				.setComponents(FormatCodeInteractionHandler.buildLanguageMenu(event.getUser().getIdLong(),messages.size()))
-				.queue(success -> sendChunksInOrder(channel, messages, 0, target,event));
+		sendChunksInOrder(channel, messages, 0, target, event, 0L);
 	}
 
 
-	private static void sendChunksInOrder(MessageChannel channel, List<String> messages, int index, Message target, @Nonnull CommandInteraction event) {
+	private static void sendChunksInOrder(MessageChannel channel, List<String> messages, int index, Message target, @Nonnull CommandInteraction event, long firstMessageID) {
 		if (index >= messages.size()) {
+			event.getHook().sendMessage("Your message has been set. If needed, you can change the language used for syntax highlighting below.")
+					.setEphemeral(true)
+					.setComponents(FormatCodeInteractionHandler.buildLanguageMenu(event.getUser().getIdLong(), messages.size(), firstMessageID))
+					.queue();
 			return;
 		}
 		var action = channel.sendMessage(messages.get(index))
@@ -67,7 +68,7 @@ private static void sendChunksInOrder(MessageChannel channel, List<String> messa
 			action.setComponents(buildActionRow(target, event.getUser().getIdLong(), messages.size()));
 		}
 
-		action.queue(sent -> sendChunksInOrder(channel, messages, index + 1, target, event));
+		action.queue(sent -> sendChunksInOrder(channel, messages, index + 1, target, event, index == 0 ? sent.getIdLong() : firstMessageID));
 	}
 
 	@Contract("_,_,_ -> new")

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

@@ -38,8 +38,8 @@ public class FormatCodeInteractionHandler implements ButtonHandler, StringSelect
 	 * @param total       the number of messages making up the block
 	 * @return the delete-all button
 	 */
-	public static Button createDeleteAllButton(long requesterID, int total){
-		return Button.secondary(ComponentIdBuilder.build(COMPONENT_ID,requesterID,total),"\uD83D\uDDD1\uFE0F");
+	public static Button createDeleteAllButton(long requesterID, int total) {
+		return Button.secondary(ComponentIdBuilder.build(COMPONENT_ID, requesterID, total), "\uD83D\uDDD1\uFE0F");
 	}
 
 	private static StringSelectMenu languageMenu(String customId) {
@@ -55,23 +55,23 @@ private static StringSelectMenu languageMenu(String customId) {
 	/**
 	 * Builds the language-selection dropdown row for a code block.
 	 *
-	 * @param requesterId the id of the user allowed to change the language
-	 * @param total       the number of messages making up the block
+	 * @param requesterId    the id of the user allowed to change the language
+	 * @param total          the number of messages making up the block
+	 * @param firstMessageID the id of first message to check update code block
 	 * @return an action row containing the language dropdown
 	 */
-	public static ActionRow buildLanguageMenu(long requesterId, int total) {
-		return ActionRow.of(languageMenu(ComponentIdBuilder.build(COMPONENT_ID, requesterId, total)));
+	public static ActionRow buildLanguageMenu(long requesterId, int total, long firstMessageID) {
+		return ActionRow.of(languageMenu(ComponentIdBuilder.build(COMPONENT_ID, requesterId, total, firstMessageID)));
 	}
 
 	@Override
 	public void handleButton(ButtonInteractionEvent event, @NonNull Button button) {
 		String[] id = ComponentIdBuilder.split(event.getComponentId());
 		long requesterId = Long.parseLong(id[1]);
 
-
 		Member member = event.getMember();
 		if (member == null) {
-			Responses.error(event, "This button may only be used inside a server.").queue();
+			Responses.errorWithTitle(event, "Server Required", "This button may only be used inside a server.").queue();
 			return;
 		}
 		if (!canManage(member, requesterId)) {
@@ -83,7 +83,7 @@ public void handleButton(ButtonInteractionEvent event, @NonNull Button button) {
 
 		LinkedMessages.resolveBefore(event.getMessage(), Integer.parseInt(id[2]),
 				messages -> event.getChannel().purgeMessages(messages),
-				() -> Responses.error(event.getHook(),"Could not delete the code block").queue());
+				() -> Responses.errorWithTitle(event.getHook(), "Undefined Behavior", "Could not delete the code block").queue());
 	}
 
 	@Override
@@ -93,7 +93,7 @@ public void handleStringSelectMenu(@NonNull StringSelectInteractionEvent event,
 
 		Member member = event.getMember();
 		if (member == null) {
-			Responses.error(event, "This menu may only be used inside a server.").queue();
+			Responses.errorWithTitle(event, "Server Required", "This menu may only be used inside a server.").queue();
 			return;
 		}
 		if (!canManage(member, requesterId)) {
@@ -104,16 +104,19 @@ public void handleStringSelectMenu(@NonNull StringSelectInteractionEvent event,
 		Language language = Language.fromString(values.getFirst());
 		event.deferEdit().queue();
 
-		LinkedMessages.resolveAfter(event.getMessage(), Integer.parseInt(id[2]),
-				messages -> messages.forEach(message ->
-						message.editMessage(withLanguage(message.getContentRaw(), language)).queue()),
-						() -> Responses.error(event.getHook(),"Could not update the code block").queue());
+		LinkedMessages.resolveAfter(event.getMessage(), Integer.parseInt(id[2]), messages -> {
+			if (messages.getLast().getIdLong() == Long.parseLong(id[3])) {
+				messages.forEach(message -> message.editMessage(withLanguage(message.getContentRaw(), language)).queue());
+			} else {
+				Responses.errorWithTitle(event.getHook(), "Merge Conflict", "The code block could not be updated. The messages may have been deleted.").queue();
+			}
+		}, () -> Responses.errorWithTitle(event.getHook(), "Undefined Behavior", "Could not update the code block").queue());
 	}
 
 	private boolean canManage(Member member, long requesterId) {
 		return member.getIdLong() == requesterId
 				|| Checks.hasStaffRole(botConfig, member)
-				|| member.isOwner() ;
+				|| member.isOwner();
 	}
 
 	/**

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

@@ -13,16 +13,17 @@
  * the whole block (only the bot's own messages) so a single interaction can delete or edit it.
  */
 public class LinkedMessages {
-	private LinkedMessages(){}
+	private LinkedMessages() {
+	}
 
 	/**
 	 * Resolves the block ending at {@code triggerMessage} (walking back {@code total} messages) and
-	 * passes the bot's own messages to {@code onResolved}, or runs {@code onError} if it can't be
-	 * safely resolved.
+	 * passes the bot's own messages to {@code onResolved}, ordered from newest to oldest.
+	 * Runs {@code onError} if the block can't be safely resolved.
 	 *
 	 * @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, ordered from newest to oldest
 	 * @param onError        runs if the block can't be safely resolved
 	 */
 	static void resolveBefore(Message triggerMessage, int total, Consumer<List<Message>> onResolved, Runnable onError) {
@@ -39,11 +40,12 @@ static void resolveBefore(Message triggerMessage, int total, Consumer<List<Messa
 
 	/**
 	 * Resolves the block of {@code total} messages sent after {@code anchorMessage} and passes the
-	 * bot's own messages to {@code onResolved}, or runs {@code onError} if it can't be safely resolved.
+	 * bot's own messages to {@code onResolved}, ordered from newest to oldest.
+	 * Runs {@code onError} if the block can't be safely resolved.
 	 *
 	 * @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, ordered from newest to oldest
 	 * @param onError       runs if the block can't be safely resolved
 	 */
 	static void resolveAfter(Message anchorMessage, int total, Consumer<List<Message>> onResolved, Runnable onError) {