Add server filter to custom commands

DiscordSRV · Nov 17, 2024 · e62302e · e62302e
1 parent 2614eaf
commit e62302e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/common/src/main/java/com/discordsrv/common/config/main/CustomCommandConfig.java b/common/src/main/java/com/discordsrv/common/config/main/CustomCommandConfig.java
@@ -64,6 +64,10 @@ public static CustomCommandConfig defaultHelloWorld() {
 
     public List<OptionConfig> options = new ArrayList<>();
 
+    @Comment("The Discord server id to register this command in\n"
+            + "Use 0 for all Discord servers, or -1 to make the command global")
+    public long serverId = 0;
+
     @Comment("Only one of the constraints has to be true to allow execution")
     public List<ConstraintConfig> constraints = new ArrayList<>(Collections.singletonList(new ConstraintConfig()));
 

diff --git a/common/src/main/java/com/discordsrv/common/feature/customcommands/CustomCommandModule.java b/common/src/main/java/com/discordsrv/common/feature/customcommands/CustomCommandModule.java
@@ -101,6 +101,9 @@ public void reload(Consumer<DiscordSRVApi.ReloadResult> resultConsumer) {
                 );
             }
 
+            commandBuilder.setGuildOnly(config.serverId >= 0);
+            commandBuilder.setGuildId(config.serverId > 0 ? config.serverId : null);
+
             ExecutionHandler handler = new ExecutionHandler(config);
             commandBuilder.setEventHandler(handler::accept);
             DiscordCommand command = commandBuilder.build();