Java-Discord
diff --git a/‎src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeInteractionHandler.java‎
Lines changed: 2 additions & 2 deletions b/‎src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeInteractionHandler.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/net/discordjug/javabot/systems/user_commands/format_code/LinkedMessages.java‎
Lines changed: 7 additions & 7 deletions b/‎src/main/java/net/discordjug/javabot/systems/user_commands/format_code/LinkedMessages.java‎
Lines changed: 7 additions & 7 deletions
@@ -112,10 +112,10 @@ private boolean isValid(ComponentInteraction event) {
 
 		Member member = event.getMember();
 		if (member == null) {
-			Responses.errorWithTitle(event, "Server Required", "This button may only be used inside a server.").queue();
+			Responses.errorWithTitle(event, "Server Required", "This may only be used inside a server.").queue();
 			return false;
 		}
-		if (!(member.getIdLong() == requesterId || Checks.hasStaffRole(botConfig, member))) {
+		if (member.getIdLong() != requesterId || !Checks.hasStaffRole(botConfig, member)) {
 			Responses.errorWithTitle(event, "Access Denied", "You are not authorized to perform this action.").queue();
 			return false;
 		}
 
@@ -16,24 +16,24 @@ public class LinkedMessages {
 	private LinkedMessages() {
 	}
 
-	/**
+		/**
 	 * Resolves a block of messages ending at {@code triggerMessage} and passes the
 	 * bot's own messages to {@code onResolved}, ordered from newest to oldest.
 	 * If {@code inclusive} is {@code true}, {@code triggerMessage} is included in
 	 * the resolved block; otherwise, only the preceding {@code total} messages are
-	 * considered. Runs {@code onError} if the block can't be safely resolved.
+	 * considered. When {@code inclusive} is {@code true}, {@code total} must be at
+	 * least 2: {@code triggerMessage} counts as one of the {@code total} messages
+	 * and the remaining {@code total - 1} are fetched from the channel history, so
+	 * a single-message inclusive block is not supported. Runs {@code onError} if
+	 * the block can't be safely resolved.
 	 *
 	 * @param triggerMessage the message marking the end of the block
-	 * @param total          the number of messages to resolve
+	 * @param total          the number of messages to resolve; must be at least 2 when {@code inclusive} is {@code true}
 	 * @param inclusive      whether {@code triggerMessage} should be included in the resolved 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, boolean inclusive,Consumer<List<Message>> onResolved, Runnable onError) {
-		if (total <= 1 && inclusive) {
-			verify(List.of(triggerMessage), total, onResolved, onError);
-			return;
-		}
 		triggerMessage.getChannel().getHistoryBefore(triggerMessage.getIdLong(), inclusive?total-1 :total).queue(history -> {
 			List<Message> block = new ArrayList<>(history.getRetrievedHistory());
 			if (inclusive){
Original file line number	Diff line number	Diff line change
@@ -112,10 +112,10 @@ private boolean isValid(ComponentInteraction event) {
112	112
113	113	Member member = event.getMember();
114	114	if (member == null) {
115		- Responses.errorWithTitle(event, "Server Required", "This button may only be used inside a server.").queue();
	115	+ Responses.errorWithTitle(event, "Server Required", "This may only be used inside a server.").queue();
116	116	return false;
117	117	}
118		- if (!(member.getIdLong() == requesterId \|\| Checks.hasStaffRole(botConfig, member))) {
	118	+ if (member.getIdLong() != requesterId \|\| !Checks.hasStaffRole(botConfig, member)) {
119	119	Responses.errorWithTitle(event, "Access Denied", "You are not authorized to perform this action.").queue();
120	120	return false;
121	121	}