more updates

Author: ROMVoid95

build.gradle

@@ -8,7 +8,7 @@ plugins {
     id 'signing'
 }
 
-def baseVersion = "4.0.1"
+def baseVersion = "4.0.2"
 def isSnapshot = false
 
 version = (isSnapshot) ? baseVersion + '-SNAPSHOT' : baseVersion

dependencies.gradle

@@ -3,7 +3,7 @@ repositories {
 }
 
 ext {
-    jdaVersion = '5.0.0-beta.2'
+    jdaVersion = '5.0.0-beta.3'
     jsonVersion = '20220320'
     lang3Version = '3.12.0'
     fasterXmlVersion = '2.14.1'

src/main/java/com/readonlydev/api/ClientInterface.java

@@ -33,9 +33,9 @@
 import com.readonlydev.command.Command;
 import com.readonlydev.command.Command.Category;
 import com.readonlydev.command.CommandListener;
-import com.readonlydev.command.client.ServerCommands;
+import com.readonlydev.command.ServerCommands;
+import com.readonlydev.command.SlashCommand;
 import com.readonlydev.command.ctx.ContextMenu;
-import com.readonlydev.command.slash.SlashCommand;
 import com.readonlydev.settings.GuildSettingsManager;
 
 import net.dv8tion.jda.api.JDA;
@@ -45,7 +45,7 @@
 /**
  * A Bot Client interface implemented on objects used to hold bot data.
  * <p>
- * This is implemented in {@link com.readonlydev.command.client.Client ClientImpl} alongside implementation of
+ * This is implemented in {@link com.readonlydev.command.Client ClientImpl} alongside implementation of
  * {@link net.dv8tion.jda.api.hooks.EventListener EventListener} to create a compounded "Client Listener" which catches
  * specific kinds of events thrown by JDA and processes them automatically to handle and execute
  * {@link com.readonlydev.command.Command Command}s.
@@ -75,13 +75,13 @@
  *           ID, that'll just flat out throw an {@link java.lang.IllegalArgumentException IllegalArgumentException}).
  *           <p>
  *           <b>4)</b> Do not provide strings when using
- *           {@link com.readonlydev.command.client.ClientBuilder#setEmojis(String, String, String)
+ *           {@link com.readonlydev.command.ClientBuilder#setEmojis(String, String, String)
  *           ClientBuilder#setEmojis(String, String, String)} that are not unicode emojis or that do not match the
  *           custom emote format specified in {@link net.dv8tion.jda.api.entities.emoji.Emoji#getFormatted()
  *           Emote#getAsMention()} (IE: {@code <:EmoteName:EmoteID>}).
  *           <p>
  *           <b>5)</b> Avoid using
- *           {@link com.readonlydev.command.client.Client#linkIds(long, net.dv8tion.jda.api.entities.Message)}. This
+ *           {@link com.readonlydev.command.Client#linkIds(long, net.dv8tion.jda.api.entities.Message)}. This
  *           will create errors and has no real purpose outside of it's current usage.
  */
 public interface ClientInterface
@@ -183,7 +183,7 @@ default void addCommands(Command... commands)
 	}
 
 	/**
-	 * Adds a single {@link com.readonlydev.command.slash.SlashCommand SlashCommand} to this Client's registered
+	 * Adds a single {@link com.readonlydev.command.SlashCommand SlashCommand} to this Client's registered
 	 * SlashCommand.
 	 * <p>
 	 * For Client's containing 20 commands or less, command calls by users will have the bot iterate through the entire
@@ -193,7 +193,7 @@ default void addCommands(Command... commands)
 	 * To prevent delay a Client that has more that 20 Commands registered to it will begin to use <b>indexed calls</b>.
 	 * <br>
 	 * Indexed calls use a {@link java.util.HashMap HashMap} which links their
-	 * {@link com.readonlydev.command.slash.SlashCommand#name name} to the index that which they are located at in the
+	 * {@link com.readonlydev.command.SlashCommand#name name} to the index that which they are located at in the
 	 * ArrayList they are stored.
 	 * <p>
 	 * This means that all insertion and removal of SlashCommands must reorganize the index maintained by the HashMap.
@@ -210,7 +210,7 @@ default void addCommands(Command... commands)
 	void indexSlashCommand(SlashCommand command);
 
 	/**
-	 * Adds a single {@link com.readonlydev.command.slash.SlashCommand SlashCommand} to this Client's registered
+	 * Adds a single {@link com.readonlydev.command.SlashCommand SlashCommand} to this Client's registered
 	 * Commands at the specified index.
 	 * <p>
 	 * For Client's containing 20 commands or less, command calls by users will have the bot iterate through the entire
@@ -316,7 +316,7 @@ default void addCommands(Command... commands)
 	List<ServerCommands> getServerCommands();
 
 	/**
-	 * Returns the list of registered {@link com.readonlydev.command.slash.SlashCommand SlashCommand}s during this
+	 * Returns the list of registered {@link com.readonlydev.command.SlashCommand SlashCommand}s during this
 	 * session.
 	 *
 	 * @return A never-null List of Slash Commands registered during this session
@@ -521,7 +521,7 @@ default void addCommands(Command... commands)
 	 *
 	 * @return {@code true} if the bot uses linked deletion, {@code false} otherwise.
 	 *
-	 * @see com.readonlydev.command.client.ClientBuilder#setLinkedCacheSize(int) ClientBuilder#setLinkedCacheSize(int)
+	 * @see com.readonlydev.command.ClientBuilder#setLinkedCacheSize(int) ClientBuilder#setLinkedCacheSize(int)
 	 */
 	boolean usesLinkedDeletion();
 
@@ -531,7 +531,7 @@ default void addCommands(Command... commands)
 	 * <p>
 	 * The returning object for this is specified via provision of a
 	 * {@link com.readonlydev.settings.GuildSettingsManager GuildSettingsManager} to
-	 * {@link com.readonlydev.command.client.ClientBuilder#setGuildSettingsManager(com.readonlydev.settings.GuildSettingsManager)
+	 * {@link com.readonlydev.command.ClientBuilder#setGuildSettingsManager(com.readonlydev.settings.GuildSettingsManager)
 	 * ClientBuilder#setGuildSettingsManager(GuildSettingsManager)}, more specifically
 	 * {@link GuildSettingsManager#getSettings(net.dv8tion.jda.api.entities.Guild)
 	 * GuildSettingsManager#getSettings(Guild)}.

src/main/java/com/readonlydev/command/client/Client.java renamed to src/main/java/com/readonlydev/command/Client.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.readonlydev.command.client;
+package com.readonlydev.command;
 
 import java.time.OffsetDateTime;
 import java.time.temporal.ChronoUnit;
@@ -51,18 +51,15 @@
 import org.slf4j.LoggerFactory;
 
 import com.readonlydev.api.ClientInterface;
-import com.readonlydev.command.Command;
 import com.readonlydev.command.Command.Category;
-import com.readonlydev.command.CommandListener;
 import com.readonlydev.command.arg.parse.ArgumentIndex;
 import com.readonlydev.command.ctx.ContextMenu;
 import com.readonlydev.command.ctx.MessageContextMenu;
 import com.readonlydev.command.ctx.UserContextMenu;
 import com.readonlydev.command.event.CommandEvent;
 import com.readonlydev.command.event.MessageContextMenuEvent;
+import com.readonlydev.command.event.SlashCommandEvent;
 import com.readonlydev.command.event.UserContextMenuEvent;
-import com.readonlydev.command.slash.SlashCommand;
-import com.readonlydev.command.slash.SlashCommandEvent;
 import com.readonlydev.common.utils.FixedSizeCache;
 import com.readonlydev.common.utils.SafeIdUtil;
 import com.readonlydev.settings.GuildSettingsManager;
@@ -131,6 +128,8 @@ public class Client implements ClientInterface, EventListener
 	private final ScheduledExecutorService								executor;
 	private final GuildSettingsManager<?>								manager;
 
+	private final LinkedList<SlashCommand> globalCommands;
+
 	private final LinkedList<SlashCommand>	totalSlashCommands;
 	private final HashMap<String, Integer>	slashCommandIndex;
 
@@ -208,6 +207,7 @@ public Client(
 		this.slashCommandIndex = new HashMap<>();
 		this.totalContextMenus = new LinkedList<>();
 		this.contextMenuIndex = new HashMap<>();
+		this.globalCommands = new LinkedList<>();
 		this.commands = new ArrayList<>();
 		this.categoryToCommandListMap = new HashMap<>();
 		this.categoryToCommandListMap.put(new Category("Uncategorized"), new ArrayList<>());
@@ -267,6 +267,7 @@ public Client(
 		for (SlashCommand command : globalSlashCommands)
 		{
 			indexSlashCommand(command);
+			globalCommands.add(command);
 		}
 
 		// Load context menus
@@ -277,6 +278,8 @@ public Client(
 
 		for (ServerCommands serverCmds : serverCommands)
 		{
+			this.serverCommands.add(serverCmds);
+
 			for (SlashCommand serverSlashCmd : serverCmds.getSlashCommands())
 			{
 				indexSlashCommand(serverSlashCmd);
@@ -316,7 +319,7 @@ public List<ServerCommands> getServerCommands()
 	@Override
 	public List<SlashCommand> getGlobalSlashCommands()
 	{
-		return totalSlashCommands.stream().filter(SlashCommand::isGlobalCommand).toList();
+		return globalCommands;
 	}
 
 	@Override
@@ -718,10 +721,7 @@ private void onReady(ReadyEvent event)
 			manager.init(event.getJDA());
 		}
 
-		if (!serverCommands.isEmpty())
-		{
-			upsertServerCommands(event.getJDA());
-		}
+		upsertServerCommands(event.getJDA());
 
 		upsertGlobalSlashCommands(event.getJDA());
 	}
@@ -730,24 +730,34 @@ public void upsertServerCommands(JDA jda)
 	{
 		if (serverCommands.isEmpty())
 		{
+			LOG.info("ServerCommands is empty. Skipping guildCommandUpsert");
 			return;
 		}
 
 		for (ServerCommands server : serverCommands)
 		{
 			List<CommandData> data = new ArrayList<>();
 
-			data.addAll(server.getSlashCommands().stream().map(SlashCommand::getCommandData).toList());
-			data.addAll(server.getContextMenus().stream().map(ContextMenu::getCommandData).toList());
+			for(SlashCommand cmd : server.getSlashCommands())
+			{
+				data.add(cmd.build());
+			}
+
+			for(ContextMenu ctx : server.getContextMenus())
+			{
+				data.add(ctx.build());
+			}
 
 			// Attempt to retrieve the provided guild
-			Guild guild = jda.getGuildById(server.getServerId());
+			Guild guild = jda.getGuildById(server.getGuildIdLong());
 			if (guild == null)
 			{
-				LOG.error("Specified guild '{}' is null! Slash Commands will NOT be added!", server.getServerId());
+				LOG.error("Specified guild '{}' is null! Slash Commands will NOT be added!", server.getGuildIdLong());
 				return;
 			} else
 			{
+				guild.updateCommands().queue();
+
 				//@noformat
 				guild.updateCommands().addCommands(data).queue(
 					priv -> LOG.info("Successfully added " + server.getSlashCommands().size() + " slash commands and " + server.getContextMenus().size() + " menus to server " + guild.getName()),
@@ -760,9 +770,11 @@ public void upsertServerCommands(JDA jda)
 	public void upsertGlobalSlashCommands(JDA jda)
 	{
 		// Get all commands
-		List<SlashCommand> globalCommands = totalSlashCommands.stream().filter(SlashCommand::isGlobalCommand).toList();
 		List<CommandData> data = new ArrayList<>();
-		data.addAll(globalCommands.stream().map(SlashCommand::getCommandData).toList());
+		for(SlashCommand cmd : globalCommands)
+		{
+			data.add(cmd.build());
+		}
 
 		jda.updateCommands().addCommands(data).queue(commands -> LOG.info("Successfully added " + globalCommands.size() + " global slash commands!"));
 	}
@@ -988,6 +1000,7 @@ private void onSlashCommand(SlashCommandInteractionEvent event)
 				listener.onSlashCommand(commandEvent, command);
 			}
 			uses.put(command.getName(), uses.getOrDefault(command.getName(), 0) + 1);
+
 			command.run(commandEvent);
 			// Command is done
 		}