improve detection of codeblocks for autoformat"

danthe1st · danthe1st · commit e6e25f464b9a · 2023-09-10T17:35:50.000+02:00
diff --git a/src/main/java/net/javadiscord/javabot/systems/help/AutoCodeFormatter.java b/src/main/java/net/javadiscord/javabot/systems/help/AutoCodeFormatter.java
@@ -47,6 +47,9 @@ private static CodeBlock findCodeblock(@NotNull MessageReceivedEvent event) {
 		if (closingBracket == -1 || openingBracket == -1) {
 			return null;
 		}
+		if (!msg.substring(openingBracket, closingBracket).contains("\n")) {
+			return null;
+		}
 		int startIndex = msg.lastIndexOf("\n", openingBracket);
 		int endIndex = msg.indexOf("\n", closingBracket);
 		if (startIndex == -1) {
@@ -99,7 +102,7 @@ void handleMessageEvent(@Nonnull MessageReceivedEvent event, boolean isFirstMess
 		}
 
 
-		if (event.getMessage().getContentRaw().contains("```")) {
+		if (event.getMessage().getContentRaw().contains("`")) {
 			return; // exit if already contains codeblock
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ private static CodeBlock findCodeblock(@NotNull MessageReceivedEvent event) {`
`47`	`47`	`if (closingBracket == -1 \|\| openingBracket == -1) {`
`48`	`48`	`return null;`
`49`	`49`	`}`
	`50`	`+ if (!msg.substring(openingBracket, closingBracket).contains("\n")) {`
	`51`	`+ return null;`
	`52`	`+ }`
`50`	`53`	`int startIndex = msg.lastIndexOf("\n", openingBracket);`
`51`	`54`	`int endIndex = msg.indexOf("\n", closingBracket);`
`52`	`55`	`if (startIndex == -1) {`
`@@ -99,7 +102,7 @@ void handleMessageEvent(@Nonnull MessageReceivedEvent event, boolean isFirstMess`
`99`	`102`	`}`
`100`	`103`
`101`	`104`
`102`		- if (event.getMessage().getContentRaw().contains("```")) {
	`105`	+ if (event.getMessage().getContentRaw().contains("`")) {
`103`	`106`	`return; // exit if already contains codeblock`
`104`	`107`	`}`
`105`	`108`