Merge pull request #342 from Java-Discord/moon/help-ping-fix

Moved /help-guidelines and /help-ping to /help

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/help/commands/HelpCommand.java

@@ -3,18 +3,20 @@
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.javadiscord.javabot.systems.help.commands.subcommands.HelpAccountSubcommand;
+import net.javadiscord.javabot.systems.help.commands.subcommands.HelpGuidelinesCommand;
+import net.javadiscord.javabot.systems.help.commands.subcommands.HelpPingCommand;
 
 /**
- * Represents the `/help` command. This holds commands for a user's Help Account.
+ * Represents the `/help` command. This holds commands related to the help system.
  */
 public class HelpCommand extends SlashCommand {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
 	 */
 	public HelpCommand() {
-		setSlashCommandData(Commands.slash("help", "Commands for managing your Help Account.")
+		setSlashCommandData(Commands.slash("help", "Commands related to the help system.")
 				.setGuildOnly(true)
 		);
-		addSubcommands(new HelpAccountSubcommand());
+		addSubcommands(new HelpAccountSubcommand(), new HelpPingCommand(), new HelpGuidelinesCommand());
 	}
 }

…help/commands/HelpGuidelinesCommand.java …s/subcommands/HelpGuidelinesCommand.javasrc/main/java/net/javadiscord/javabot/systems/help/commands/HelpGuidelinesCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/help/commands/subcommands/HelpGuidelinesCommand.java src/main/java/net/javadiscord/javabot/systems/help/commands/HelpGuidelinesCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/help/commands/subcommands/HelpGuidelinesCommand.java

@@ -1,10 +1,10 @@
-package net.javadiscord.javabot.systems.help.commands;
+package net.javadiscord.javabot.systems.help.commands.subcommands;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.GuildChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.data.config.guild.HelpConfig;
 import net.javadiscord.javabot.util.Responses;
@@ -16,14 +16,12 @@
 /**
  * Shows the server's help-guidelines.
  */
-public class HelpGuidelinesCommand extends SlashCommand {
+public class HelpGuidelinesCommand extends SlashCommand.Subcommand {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
 	 */
 	public HelpGuidelinesCommand() {
-		setSlashCommandData(Commands.slash("help-guidelines", "Show the server's help guidelines in a simple format.")
-				.setGuildOnly(true)
-		);
+		setSubcommandData(new SubcommandData("guidelines", "Show the server's help guidelines in a simple format."));
 	}
 
 	@Override

…stems/help/commands/HelpPingCommand.java …ommands/subcommands/HelpPingCommand.javasrc/main/java/net/javadiscord/javabot/systems/help/commands/HelpPingCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/help/commands/subcommands/HelpPingCommand.java src/main/java/net/javadiscord/javabot/systems/help/commands/HelpPingCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/help/commands/subcommands/HelpPingCommand.java

@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.help.commands;
+package net.javadiscord.javabot.systems.help.commands.subcommands;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -19,7 +19,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Handler for the /help-ping command that allows users to occasionally ping
+ * Handler for the /help ping sub-command that allows users to occasionally ping
  * helpers.
  */
 public class HelpPingCommand extends SlashCommand.Subcommand {
@@ -32,7 +32,7 @@ public class HelpPingCommand extends SlashCommand.Subcommand {
 	 * Constructor that initializes and handles the cooldown map.
 	 */
 	public HelpPingCommand() {
-		setSubcommandData(new SubcommandData("help-ping", "Notify those with the help-ping role that your question is urgent."));
+		setSubcommandData(new SubcommandData("ping", "Notify those with the help-ping role that your question is urgent."));
 		lastPingTimes = new ConcurrentHashMap<>();
 		Bot.getAsyncPool().scheduleWithFixedDelay(this::cleanTimeoutCache, CACHE_CLEANUP_DELAY, CACHE_CLEANUP_DELAY, TimeUnit.SECONDS);
 	}