diff --git a/src/main/java/netneutrality/command/basic/HelpCommand.java b/src/main/java/netneutrality/command/basic/HelpCommand.java index 4adc295..cbd391c 100644 --- a/src/main/java/netneutrality/command/basic/HelpCommand.java +++ b/src/main/java/netneutrality/command/basic/HelpCommand.java @@ -14,8 +14,6 @@ import netneutrality.command.Visibility; import netneutrality.utils.Settings; public class HelpCommand extends AbstractCommand { - - private String help = ""; public HelpCommand() { @@ -23,53 +21,44 @@ public class HelpCommand extends AbstractCommand { @Override public String execute(MessageReceivedEvent event, String args) { - EmbedBuilder embed = new EmbedBuilder(); - embed.setColor(Color.green); - embed.addField("Commands for Net Neutrality", help, false); - - event.getTextChannel().sendMessage(new MessageBuilder().append(event.getAuthor()).append(" help has been sent your way!").build()).queue(); - - event.getAuthor().openPrivateChannel().queue(t -> t.sendMessage(embed.build()).queue()); return null; } public void sendHelp(HashMap commands, HashMap alias, User user, MessageChannel channel) { + StringBuilder help = new StringBuilder(); + for (AbstractCommand command : commands.values()) { if (command.getUsage() != null) - help += Settings.PREFIX + command.getCommand() + " (: " + command.getUsage() + "\n"; + help.append(Settings.PREFIX).append(command.getCommand()).append(" (: ").append(command.getUsage()).append("\n"); } - EmbedBuilder embed = new EmbedBuilder(); embed.setColor(Color.green); - embed.addField("Commands for Net Neutrality", help, false); + embed.addField("Commands for Net Neutrality", help.toString(), false); if (channel instanceof TextChannel) channel.sendMessage(new MessageBuilder().append(user).append(" help has been sent your way!").build()).queue(); + user.openPrivateChannel().queue(t -> t.sendMessage(embed.build()).queue()); } @Override public boolean needAdmin() { - // TODO Auto-generated method stub return false; } @Override public boolean isEnabled() { - // TODO Auto-generated method stub return true; } @Override public String getCommand() { - // TODO Auto-generated method stub return "help"; } @Override public String[] getAlias() { - // TODO Auto-generated method stub return new String[0]; }