Change command upserting to use updateCommands

Author: Matyrobbrt

src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java

@@ -83,6 +83,7 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import io.github.matyrobbrt.curseforgeapi.CurseForgeAPI;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
@@ -267,7 +268,7 @@ public static ComponentListener.Builder getComponentListener(final String featur
     private Configuration generalConfig;
     private final Dotenv dotenv;
     private final Path runPath;
-    private final Long2ObjectMap<GuildConfiguration> guildConfigs = new Long2ObjectOpenHashMap<>();
+    private final Long2ObjectMap<GuildConfiguration> guildConfigs = Long2ObjectMaps.synchronize(new Long2ObjectOpenHashMap<>());
 
     private final String githubToken;
 
@@ -569,18 +570,20 @@ public String getGithubToken() {
     }
 
     public GuildConfiguration getConfigForGuild(long guildId) {
-        return guildConfigs.computeIfAbsent(guildId, rethrowFunction(id -> {
-            final var path = runPath.resolve("configs").resolve("guild").resolve(guildId + ".conf");
-            final HoconConfigurationLoader loader = HoconConfigurationLoader.builder()
-                .emitComments(true)
-                .prettyPrinting(true)
-                .defaultOptions(ConfigurationOptions.defaults().serializers(ADDED_SERIALIZERS))
-                .path(path)
-                .build();
-            return ConfigurateUtils.loadConfig(loader, path, cfg -> guildConfigs.put(guildId, cfg), GuildConfiguration.class, GuildConfiguration.EMPTY)
-                .value()
-                .get();
-        }));
+        synchronized (guildConfigs) {
+            return guildConfigs.computeIfAbsent(guildId, rethrowFunction(id -> {
+                final var path = runPath.resolve("configs").resolve("guild").resolve(guildId + ".conf");
+                final HoconConfigurationLoader loader = HoconConfigurationLoader.builder()
+                    .emitComments(true)
+                    .prettyPrinting(true)
+                    .defaultOptions(ConfigurationOptions.defaults().serializers(ADDED_SERIALIZERS))
+                    .path(path)
+                    .build();
+                return ConfigurateUtils.loadConfig(loader, path, cfg -> guildConfigs.put(guildId, cfg), GuildConfiguration.class, GuildConfiguration.EMPTY)
+                    .value()
+                    .get();
+            }));
+        }
     }
 
     public GuildConfiguration getConfigForGuild(Guild guild) {

src/core/java/com/mcmoddev/mmdbot/core/commands/CommandUpserter.java

@@ -33,18 +33,15 @@
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
 import net.dv8tion.jda.api.hooks.EventListener;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.requests.ErrorResponse;
-import net.dv8tion.jda.api.requests.RestAction;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.LongStream;
+import java.util.stream.Stream;
 
 /**
  * Utility class for upserting commands. <br>
@@ -110,68 +107,34 @@ public void upsertCommands(@NonNull final JDA jda) {
         if (forceGuild) {
             final var guild = Objects.requireNonNull(guildId).resolve(jda::getGuildById);
             if (guild == null) throw new NullPointerException("Unknown guild with ID: " + guildId);
-            guild.retrieveCommands().queue(commands -> {
-                // Delete old commands.
-                final var toRemove = getCommandsToRemove(commands);
-                if (toRemove.length > 0) {
-                    RestAction.allOf(LongStream.of(toRemove).mapToObj(guild::deleteCommandById).toList()).queue();
-                }
-
-                // Upsert new ones
-                RestAction.allOf(client.getSlashCommands().stream()
-                        .map(SlashCommand::buildCommandData)
-                        .map(guild::upsertCommand)
-                        .collect(Collectors.toSet()))
-                    .queue(cmds -> LOG.info("Registered {} commands to guild '{}' ({})", cmds.size(), guild.getName(), guild.getId()), createErrorHandler(guild));
 
-                if (!client.getContextMenus().isEmpty()) {
-                    // Upsert menus
-                    RestAction.allOf(client.getContextMenus().stream()
-                            .map(ContextMenu::buildCommandData)
-                            .map(guild::upsertCommand)
-                            .collect(Collectors.toSet()))
-                        .queue(cmds -> LOG.info("Registered {} context menus to guild '{}' ({})", cmds.size(), guild.getName(), guild.getId()), createErrorHandler(guild));
-                }
-            });
+            // Update the guild commands
+            guild.updateCommands()
+                .addCommands(Stream.concat(
+                    client.getSlashCommands().stream().map(SlashCommand::buildCommandData),
+                    client.getContextMenus().stream().map(ContextMenu::buildCommandData)
+                ).toList())
+                .queue(it -> LOG.info("Registered {} commands to guild '{}' ({}).", it.size(), guild.getName(), guild.getId()), createErrorHandler(guild));
         } else {
             if (guildId != null) {
                 final var guild = guildId.resolve(jda::getGuildById);
                 if (guild != null) {
                     // Guild still specified? Then remove guild commands
                     guild.retrieveCommands().queue(commands -> {
                         if (!commands.isEmpty()) {
-                            RestAction.allOf(commands.stream()
-                                .map(Command::getIdLong)
-                                .map(guild::deleteCommandById)
-                                .toList()).queue();
+                            guild.updateCommands().queue();
                         }
                     });
                 }
             }
-            jda.retrieveCommands().queue(commands -> {
-                // Delete old commands.
-                final var toRemove = getCommandsToRemove(commands);
-                if (toRemove.length > 1) {
-                    RestAction.allOf(LongStream.of(toRemove).mapToObj(jda::deleteCommandById).toList()).queue();
-                }
-
-                // Upsert new ones
-                RestAction.allOf(client.getSlashCommands()
-                        .stream()
-                        .map(SlashCommand::buildCommandData)
-                        .map(jda::upsertCommand)
-                        .collect(Collectors.toSet()))
-                    .queue(cmds -> LOG.info("Registered {} global commands.", cmds.size()));
 
-                if (!client.getContextMenus().isEmpty()) {
-                    // Upsert menus
-                    RestAction.allOf(client.getContextMenus().stream()
-                            .map(ContextMenu::buildCommandData)
-                            .map(jda::upsertCommand)
-                            .collect(Collectors.toSet()))
-                        .queue(cmds -> LOG.info("Registered {} context menus.", cmds.size()));
-                }
-            });
+            // Update the global commands
+            jda.updateCommands()
+                .addCommands(Stream.concat(
+                    client.getSlashCommands().stream().map(SlashCommand::buildCommandData),
+                    client.getContextMenus().stream().map(ContextMenu::buildCommandData)
+                ).toList())
+                .queue(it -> LOG.info("Registered {} global commands.", it.size()));
         }
     }
 
@@ -201,21 +164,4 @@ public ErrorHandler createErrorHandler(final Guild guild) {
         });
     }
 
-    private long[] getCommandsToRemove(final List<Command> existingCommands) {
-        record ExistingCommand(String name, long id) {
-        }
-        final var ext = existingCommands.stream()
-            .filter(c -> c.getType() == Command.Type.SLASH)
-            .map(c -> new ExistingCommand(c.getName(), c.getIdLong()))
-            .collect(Collectors.toSet());
-        final var clientCommandNames = client.getSlashCommands().stream().map(SlashCommand::getName).collect(Collectors.toSet());
-        ext.removeIf(p -> {
-            final var contains = clientCommandNames.contains(p.name());
-            if (contains) {
-                clientCommandNames.remove(p.name());
-            }
-            return contains;
-        });
-        return ext.stream().mapToLong(ExistingCommand::id).toArray();
-    }
 }