feat: guild only (pt. 2) #20

Softawii · Oct 9, 2024 · 2a5a821 · 2a5a821
1 parent bf0a35b
commit 2a5a821
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/com/softawii/Main.java b/src/main/java/com/softawii/Main.java
@@ -41,7 +41,7 @@ public static void main(String[] args) throws InterruptedException, NoSuchMethod
         JDA JDA = builder.build();
         JDA.awaitReady();
 
-        boolean reset = false;
+        boolean reset = true;
         CurupiraBoot curupira = new CurupiraBoot(JDA, context, reset, pkg);
 
         JDA.awaitReady();

diff --git a/src/main/java/com/softawii/curupira/v2/core/CurupiraBoot.java b/src/main/java/com/softawii/curupira/v2/core/CurupiraBoot.java
@@ -2,6 +2,7 @@
 
 import com.softawii.curupira.v2.integration.ContextProvider;
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.*;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
@@ -28,9 +29,18 @@ public CurupiraBoot(@NotNull JDA jda, @NotNull ContextProvider context, boolean
         this.jda = jda;
         this.logger.info("Curupira configuration loaded. Values: jda={}, registerCommandsToDiscord={}, packages={}", jda, registerCommandsToDiscord, packages);
 
+        try {
+            this.jda.awaitReady();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
         // reset commands?
         if(registerCommandsToDiscord) {
             this.jda.updateCommands().addCommands().queue();
+            for(Guild guild : this.jda.getGuilds()) {
+                guild.updateCommands().addCommands().queue();
+            }
         }
 
         this.exceptionMapper = new ExceptionMapper(context, packages);

diff --git a/src/main/java/com/softawii/example/controller/AdminController.java b/src/main/java/com/softawii/example/controller/AdminController.java
@@ -16,7 +16,7 @@
 import java.awt.*;
 import java.util.List;
 
-@DiscordController(value = "admin", description = "hello!", guildId = 856534404779868180L, permissions = Permission.ADMINISTRATOR)
+@DiscordController(value = "admin2", description = "hello!", guildId = 856534404779868180L, permissions = Permission.ADMINISTRATOR)
 public class AdminController {
 
     private static final int guildPageSize = 5;