Skip to content

use java codeblock when autoformatting code in help channels #473

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 3 commits into from
Jan 26, 2024
Merged

use java codeblock when autoformatting code in help channels #473

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6ad144
use java codeblock when autoformatting code in help channels
danthe1st Jan 7, 2024
a9006c3
use JDA constant for message length
danthe1st Jan 8, 2024
ed1c7bb
create constants for codeblock prefix and suffix
danthe1st Jan 8, 2024
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
10 changes: 7 additions & 3 deletions src/main/java/net/discordjug/javabot/systems/help/AutoCodeFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import net.discordjug.javabot.util.WebhookUtil;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

Expand All @@ -27,6 +28,8 @@
@RequiredArgsConstructor
@Component
public class AutoCodeFormatter {
private static final String CODEBLOCK_PREFIX = " ```java";
private static final String CODEBLOCK_SUFFIX = " ```";
private final AutoMod autoMod;
private final BotConfig botConfig;
private final UserPreferenceService preferenceService;
Expand Down Expand Up @@ -128,15 +131,16 @@ private void sendFormatHint(MessageReceivedEvent event) {
).queue();
}


private void replaceUnformattedCode(String msg, int codeStartIndex, int codeEndIndex, MessageReceivedEvent event) {
// default case: a "normal", non-ping containing, non first message of a forum-thread containing "{" and "}".
// user must also have set their preferences to allow this.
if (msg.length() > 1992) { // can't exceed discord's char limit
if (msg.length() > Message.MAX_CONTENT_LENGTH - CODEBLOCK_PREFIX.length() - CODEBLOCK_SUFFIX.length()) { // can't exceed discord's char limit
sendFormatHint(event);
return;
}
String messageContent = msg.substring(0, codeStartIndex) + " ```" +
msg.substring(codeStartIndex, codeEndIndex) + " ```" + msg.substring(codeEndIndex);
String messageContent = msg.substring(0, codeStartIndex) + CODEBLOCK_PREFIX +
msg.substring(codeStartIndex, codeEndIndex) + CODEBLOCK_SUFFIX + msg.substring(codeEndIndex);
EmbedBuilder autoformatInfo = new EmbedBuilder().setDescription(botConfig.get(event.getGuild())
.getHelpConfig()
.getAutoFormatInfoMessage());
Expand Down