Skip to content

improve detection of codeblocks for autoformat #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2023
Merged

improve detection of codeblocks for autoformat #436

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6e25f4
improve detection of codeblocks for autoformat"
danthe1st Sep 10, 2023
b09a8c8
use string param instead of Message
danthe1st Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/main/java/net/javadiscord/javabot/systems/help/AutoCodeFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,20 @@ public class AutoCodeFormatter {
/**
* Method responsible for finding a place to insert a codeblock, if present.
*
* @param event a {@link MessageReceivedEvent}.
* @param msg the content of the message.
* @return a MessageCodeblock instance, holding a startIndex, content and
* an endIndex. Returns null if no place was found.
*/
@Nullable
private static CodeBlock findCodeblock(@NotNull MessageReceivedEvent event) {
String msg = event.getMessage().getContentRaw();
private static CodeBlock findCodeblock(@NotNull String msg) {
int openingBracket = msg.indexOf("{");
int closingBracket = msg.lastIndexOf("}");
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) {
Expand Down Expand Up @@ -99,11 +101,11 @@ void handleMessageEvent(@Nonnull MessageReceivedEvent event, boolean isFirstMess
}


if (event.getMessage().getContentRaw().contains("```")) {
if (event.getMessage().getContentRaw().contains("`")) {
return; // exit if already contains codeblock
}

CodeBlock code = findCodeblock(event);
CodeBlock code = findCodeblock(event.getMessage().getContentRaw());
if (code == null) {
return;
}
Expand Down