Fix choices in SlashCommand parsing

surajkumar · surajkumar · commit f6f36287e541 · 2024-05-26T22:30:57.000+01:00
diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/annotations/CommandOption.java b/annotations/src/main/java/com/javadiscord/jdi/core/annotations/CommandOption.java
@@ -15,5 +15,7 @@
 
     CommandOptionType type();
 
+    CommandOptionChoice[] choices() default {};
+
     boolean required() default true;
 }
diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/annotations/CommandOptionChoice.java b/annotations/src/main/java/com/javadiscord/jdi/core/annotations/CommandOptionChoice.java
@@ -0,0 +1,13 @@
+package com.javadiscord.jdi.core.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({})
+public @interface CommandOptionChoice {
+    String name();
+
+    String value();
+}
diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CommandOption.java b/api/src/main/java/com/javadiscord/jdi/core/api/builders/command/CommandOption.java
@@ -29,6 +29,11 @@ public CommandOption addChoice(String name, String value) {
         return this;
     }
 
+    public CommandOption addChoice(List<CommandOptionChoice> commandOptionChoices) {
+        choices.addAll(commandOptionChoices);
+        return this;
+    }
+
     public CommandOption setRequired(boolean required) {
         this.required = required;
         return this;
diff --git a/core/src/main/java/com/javadiscord/jdi/core/Discord.java b/core/src/main/java/com/javadiscord/jdi/core/Discord.java
@@ -18,6 +18,7 @@
 
 import com.javadiscord.jdi.core.api.builders.command.CommandBuilder;
 import com.javadiscord.jdi.core.api.builders.command.CommandOption;
+import com.javadiscord.jdi.core.api.builders.command.CommandOptionChoice;
 import com.javadiscord.jdi.core.api.builders.command.CommandOptionType;
 import com.javadiscord.jdi.core.interaction.InteractionEventHandler;
 import com.javadiscord.jdi.core.models.ready.ReadyEvent;
@@ -164,13 +165,35 @@ private void registerLoadedAnnotationsWithDiscord() {
                             Method optionRequiredMethod = option.getClass().getMethod("required");
                             boolean optionRequired = (boolean) optionRequiredMethod.invoke(option);
 
+                            List<CommandOptionChoice> choices = new ArrayList<>();
+
+                            Object[] choicesArray =
+                                (Object[]) option.getClass().getMethod("choices").invoke(option);
+
+                            for (Object choice : choicesArray) {
+                                Annotation annotation1 = (Annotation) choice;
+                                if (
+                                    annotation1.annotationType().getName().equals(
+                                        "com.javadiscord.jdi.core.annotations.CommandOptionChoice"
+                                    )
+                                ) {
+                                    Method nameMethod1 =
+                                        annotation1.annotationType().getMethod("name");
+                                    Method valueMethod1 =
+                                        annotation1.annotationType().getMethod("value");
+                                    String name1 = (String) nameMethod1.invoke(annotation1);
+                                    String value1 = (String) valueMethod1.invoke(annotation1);
+                                    choices.add(new CommandOptionChoice(value1, name1));
+                                }
+                            }
+
                             builder.addOption(
                                 new CommandOption(
                                     optionName,
                                     optionDescription,
                                     CommandOptionType.fromName(optionTypeValue),
                                     optionRequired
-                                )
+                                ).addChoice(choices)
                             );
                         }
 
diff --git a/core/src/main/java/com/javadiscord/jdi/core/interaction/SlashCommandEvent.java b/core/src/main/java/com/javadiscord/jdi/core/interaction/SlashCommandEvent.java
@@ -32,12 +32,12 @@ public InteractionData interactionData() {
         return interaction.data();
     }
 
-    public Object option(String name) {
+    public ApplicationCommandOption option(String name) {
         InteractionData interactionData = interaction.data();
         ApplicationCommandOption[] options = interactionData.options();
         for (ApplicationCommandOption option : options) {
             if (option.name().equals(name)) {
-                return option.value();
+                return option;
             }
         }
         return null;
diff --git a/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleSlashCommand.java b/example/echo-bot/src/main/java/com/javadiscord/jdi/example/ExampleSlashCommand.java
@@ -3,7 +3,9 @@
 import com.javadiscord.jdi.core.CommandOptionType;
 import com.javadiscord.jdi.core.Guild;
 import com.javadiscord.jdi.core.annotations.CommandOption;
+import com.javadiscord.jdi.core.annotations.CommandOptionChoice;
 import com.javadiscord.jdi.core.annotations.SlashCommand;
+import com.javadiscord.jdi.core.api.builders.CreateMessageBuilder;
 import com.javadiscord.jdi.core.interaction.SlashCommandEvent;
 import com.javadiscord.jdi.core.models.application.ApplicationCommandOption;
 
@@ -12,23 +14,98 @@ public class ExampleSlashCommand {
     @SlashCommand(
         name = "quiz", description = "A fun Java quiz", options = {
             @CommandOption(
-                name = "q1", description = "What is an Integer?", type = CommandOptionType.STRING
+                name = "q1", description = "What is an Integer?", type = CommandOptionType.STRING, choices = {
+                    @CommandOptionChoice(
+                        name = "option1", value = "An object that represents a number"
+                    ),
+                    @CommandOptionChoice(name = "option2", value = "A class used to store objects"),
+                    @CommandOptionChoice(name = "option3", value = "A primitive data type")
+                }
             ),
             @CommandOption(
-                name = "q2", description = "What package is List in?", type = CommandOptionType.STRING
+                name = "q2", description = "In which package is the List interface defined?", type = CommandOptionType.STRING, choices = {
+                    @CommandOptionChoice(name = "option1", value = "java.util"),
+                    @CommandOptionChoice(name = "option2", value = "java.lang"),
+                    @CommandOptionChoice(name = "option3", value = "java.io")
+                }
             ),
             @CommandOption(
-                name = "q3", description = "What does JVM stand for?", type = CommandOptionType.STRING
+                name = "q3", description = "What does JVM stand for?", type = CommandOptionType.STRING, choices = {
+                    @CommandOptionChoice(name = "option1", value = "Java Virtual Machine"),
+                    @CommandOptionChoice(name = "option2", value = "Java Verified Module"),
+                    @CommandOptionChoice(name = "option3", value = "Java Variable Method")
+                }
             ),
             @CommandOption(
-                name = "q4", description = "Is a String a primitive?", type = CommandOptionType.STRING
+                name = "q4", description = "Is a String a primitive data type?", type = CommandOptionType.STRING, choices = {
+                    @CommandOptionChoice(name = "option1", value = "Yes"),
+                    @CommandOptionChoice(name = "option2", value = "No")
+                }
             ),
+            @CommandOption(
+                name = "q5", description = "Which of the following is not a Java keyword?", type = CommandOptionType.STRING, choices = {
+                    @CommandOptionChoice(name = "option1", value = "static"),
+                    @CommandOptionChoice(name = "option2", value = "void"),
+                    @CommandOptionChoice(name = "option3", value = "main"),
+                    @CommandOptionChoice(name = "option4", value = "private")
+                }
+            )
         }
     )
     public void handle(SlashCommandEvent event, Guild guild) {
-        ApplicationCommandOption[] options = event.options();
-        for (ApplicationCommandOption option : options) {
-            System.out.println("Received " + option.name() + " value " + option.valueAsString());
+        ApplicationCommandOption q1 = event.option("q1");
+        ApplicationCommandOption q2 = event.option("q2");
+        ApplicationCommandOption q3 = event.option("q3");
+        ApplicationCommandOption q4 = event.option("q4");
+        ApplicationCommandOption q5 = event.option("q5");
+
+        // Check answers and prepare feedback
+        StringBuilder feedback = new StringBuilder();
+        int score = 0;
+
+        if (q1.toString().equals("option1")) {
+            score++;
+            feedback.append("Q1: Correct!\n");
+        } else {
+            feedback.append("Q1: Incorrect\n");
+        }
+
+        if (q2.toString().equals("option1")) {
+            score++;
+            feedback.append("Q2: Correct!\n");
+        } else {
+            feedback.append("Q1: Incorrect\n");
+        }
+
+        if (q3.toString().equals("option1")) {
+            score++;
+            feedback.append("Q3: Correct!\n");
+        } else {
+            feedback.append("Q1: Incorrect\n");
         }
+
+        if (q4.toString().equals("option2")) {
+            score++;
+            feedback.append("Q4: Correct!\n");
+        } else {
+            feedback.append("Q1: Incorrect\n");
+        }
+
+        if (q5.toString().equals("option3")) {
+            score++;
+            feedback.append("Q5: Correct!\n");
+        } else {
+            feedback.append("Q1: Incorrect\n");
+        }
+
+        feedback.append("Your score: ").append(score).append("/5");
+
+        if (score == 5) {
+            feedback.append("\nCongratulations! You you all the questions right!\n");
+        }
+
+        guild.channel().createMessage(
+            new CreateMessageBuilder(event.channel().id()).content(feedback.toString())
+        );
     }
 }
diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationCommandOption.java b/models/src/main/java/com/javadiscord/jdi/core/models/application/ApplicationCommandOption.java
@@ -29,4 +29,9 @@ public double valueAsDouble() {
     public boolean valueAsBoolean() {
         return (boolean) value;
     }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value == null ? "" : value);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,7 @@`
`15`	`15`
`16`	`16`	`CommandOptionType type();`
`17`	`17`
	`18`	`+ CommandOptionChoice[] choices() default {};`
	`19`	`+`
`18`	`20`	`boolean required() default true;`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ public InteractionData interactionData() {`
`32`	`32`	`return interaction.data();`
`33`	`33`	`}`
`34`	`34`
`35`		`- public Object option(String name) {`
	`35`	`+ public ApplicationCommandOption option(String name) {`
`36`	`36`	`InteractionData interactionData = interaction.data();`
`37`	`37`	`ApplicationCommandOption[] options = interactionData.options();`
`38`	`38`	`for (ApplicationCommandOption option : options) {`
`39`	`39`	`if (option.name().equals(name)) {`
`40`		`- return option.value();`
	`40`	`+ return option;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,9 @@ public double valueAsDouble() {`
`29`	`29`	`public boolean valueAsBoolean() {`
`30`	`30`	`return (boolean) value;`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ @Override`
	`34`	`+ public String toString() {`
	`35`	`+ return String.valueOf(value == null ? "" : value);`
	`36`	`+ }`
`32`	`37`	`}`