(feat): add Guild bean, don't create commands if empty

Author: ZakShearman

src/main/java/pink/zak/discord/utils/autoconfig/JdaAutoConfiguration.java

@@ -3,10 +3,13 @@
 import lombok.RequiredArgsConstructor;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import pink.zak.discord.utils.configuration.JdaConfiguration;
@@ -41,4 +44,11 @@ public JDA jda() throws LoginException, InterruptedException {
                 .awaitReady();
 
     }
+
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty("spring.discord.guild-id")
+    public Guild guild(@NotNull JDA jda) {
+        return jda.getGuildById(jdaConfiguration.getGuildId());
+    }
 }

src/main/java/pink/zak/discord/utils/discord/DiscordCommandBackend.java

@@ -100,6 +100,11 @@ private List<Command> createNewCommands(@Nullable Guild guild) {
         Set<CommandData> createdData = this.commandsByName.values().stream().map(commandData -> commandData.command().createCommandData()).collect(Collectors.toSet());
         LOGGER.info("Created data {}", createdData);
 
+        if (createdData.isEmpty()) {
+            LOGGER.warn("No commands were created, this is likely due to no commands being registered");
+            return List.of();
+        }
+
         List<Command> createdCommands;
         if (guild == null) createdCommands = this.jda.updateCommands().addCommands(createdData).complete();
         else createdCommands = guild.updateCommands().addCommands(createdData).complete();