Skip to content

Commit bbd0f50

Browse files
committed
Updates:
- Partially fixed issue #131 (only one line of spigot doesn't appear)
1 parent 87c0355 commit bbd0f50

1 file changed

Lines changed: 26 additions & 22 deletions

File tree

src/main/java/net/thesimpleteam/simplebot/SimpleBot.java

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
import net.dv8tion.jda.api.OnlineStatus;
1515
import net.dv8tion.jda.api.entities.Activity;
1616
import net.dv8tion.jda.api.entities.Guild;
17+
import net.dv8tion.jda.api.entities.PrivateChannel;
1718
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
19+
import net.dv8tion.jda.api.exceptions.PermissionException;
1820
import net.dv8tion.jda.api.requests.GatewayIntent;
1921
import net.dv8tion.jda.api.utils.cache.CacheFlag;
2022
import net.thesimpleteam.simplebot.cli.CLI;
@@ -150,32 +152,34 @@ public static void main(String[] args) throws InterruptedException {
150152
}
151153

152154
private static void getHelpConsumer(CommandEvent event, Bot bot) {
153-
StringBuilder helpBuilder = new StringBuilder(String.format(MessageHelper.translateMessage(event, "help.commands"), event.getSelfUser().getName()));
154-
for(CommandCategories category : CommandCategories.values()) {
155-
if(bot.commands.stream().noneMatch(command -> category.category == command.getCategory())) continue;
156-
helpBuilder.append("\n\n__").append(MessageHelper.translateMessage(event, category.category.getName())).append("__ :\n");
157-
for (Command command : bot.commands.stream().filter(command -> category.category == command.getCategory()).toList()) {
158-
if(command.isHidden() || (command.isOwnerCommand() && !event.isOwner())) continue;
159-
String translatedHelp = MessageHelper.translateMessage(event, command.getHelp());
160-
if(translatedHelp.contains("²")) {
161-
String[] splittedHelp = translatedHelp.split("²");
162-
for (int index = 0; index < splittedHelp.length - 1; index++) {
163-
helpBuilder.append("\n`").append(getPrefix(event.getGuild())).append(command.getName()).append(" ").append(MessageHelper.translateMessage(event, command.getArguments()).split("²")[index]).append("`").append(" ➡ *").append(splittedHelp[index]).append("*");
155+
try {
156+
event.getAuthor().openPrivateChannel().complete();
157+
StringBuilder helpBuilder = new StringBuilder(String.format(MessageHelper.translateMessage(event, "help.commands"), event.getSelfUser().getName()));
158+
for(CommandCategories category : CommandCategories.values()) {
159+
if(bot.commands.stream().noneMatch(command -> category.category == command.getCategory())) continue;
160+
helpBuilder.append("\n\n__").append(MessageHelper.translateMessage(event, category.category.getName())).append("__ :\n");
161+
for (Command command : bot.commands.stream().filter(command -> category.category == command.getCategory()).toList()) {
162+
if(command.isHidden() || (command.isOwnerCommand() && !event.isOwner())) continue;
163+
String translatedHelp = MessageHelper.translateMessage(event, command.getHelp());
164+
if(translatedHelp.contains("²")) {
165+
String[] splittedHelp = translatedHelp.split("²");
166+
for (int index = 1; index < splittedHelp.length - 1; index++) {
167+
helpBuilder.append("\n`").append(getPrefix(event.getGuild())).append(command.getName()).append(" ").append(MessageHelper.translateMessage(event, command.getArguments()).split("²")[index]).append("`").append(" ➡ *").append(splittedHelp[index]).append("*");
168+
}
169+
} else {
170+
helpBuilder.append("\n`").append(getPrefix(event.getGuild())).append(command.getName()).append(" ").append(command.getArguments() != null ? command.getArguments().startsWith("arguments.") ? MessageHelper.translateMessage(event, command.getArguments()) : command.getArguments() : "").append("`").append(" \u27A1 *").append(MessageHelper.translateMessage(event, command.getHelp())).append("*");
164171
}
165-
} else {
166-
helpBuilder.append("\n`").append(getPrefix(event.getGuild())).append(command.getName()).append(" ").append(command.getArguments() != null ?
167-
command.getArguments().startsWith("arguments.") ? MessageHelper.translateMessage(event, command.getArguments()) : command.getArguments() : "").append("`")
168-
.append(" \u27A1 *").append(MessageHelper.translateMessage(event, command.getHelp())).append("*");
169172
}
170173
}
174+
if (event.getJDA().getUserById(bot.ownerID) != null) {
175+
helpBuilder.append("\n\n").append(MessageHelper.translateMessage(event, "help.contact")).append(" **").append(MessageHelper.getTag(event.getJDA().getUserById(bot.ownerID))).append("**");
176+
if (event.getClient().getServerInvite() != null)
177+
helpBuilder.append(' ').append(MessageHelper.translateMessage(event, "help.discord")).append(' ').append(bot.serverInvite);
178+
}
179+
event.replyInDm(helpBuilder.toString(), unused -> {}, unused -> {});
180+
} catch (PermissionException e) {
181+
event.reply(MessageHelper.translateMessage(event, "help.DMBlocked"));
171182
}
172-
if (event.getJDA().getUserById(bot.ownerID) != null) {
173-
helpBuilder.append("\n\n").append(MessageHelper.translateMessage(event, "help.contact")).append(" **").append(MessageHelper.getTag(event.getJDA().getUserById(bot.ownerID))).append("**");
174-
if (event.getClient().getServerInvite() != null)
175-
helpBuilder.append(' ').append(MessageHelper.translateMessage(event, "help.discord")).append(' ').append(bot.serverInvite);
176-
}
177-
event.replyInDm(helpBuilder.toString(), unused -> {
178-
}, t -> event.reply(MessageHelper.translateMessage(event, "help.DMBlocked")));
179183
}
180184

181185
private static void setupLocalizations() throws IOException {

0 commit comments

Comments
 (0)