fixes for discord application commands

DenizenScript · May 22, 2022 · baecfb8 · baecfb8
1 parent a7c2279
commit baecfb8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordCommandCommand.java b/src/main/java/com/denizenscript/ddiscordbot/commands/DiscordCommandCommand.java
@@ -239,11 +239,6 @@ else if (name == null) {
                 boolean isEnabled = enabled == null || enabled.asBoolean();
                 switch (commandInstructionEnum) {
                     case CREATE: {
-                        if (description == null) {
-                            Debug.echoError(scriptEntry, "Must specify a description!");
-                            scriptEntry.setFinished(true);
-                            return;
-                        }
                         CommandData data;
                         switch (CoreUtilities.toLowerCase(type.asString())) {
                             case "message":
@@ -253,6 +248,11 @@ else if (name == null) {
                                 data = Commands.user(name.asString());
                                 break;
                             default:
+                                if (description == null) {
+                                    Debug.echoError(scriptEntry, "Must specify a description!");
+                                    scriptEntry.setFinished(true);
+                                    return;
+                                }
                                 data = Commands.slash(name.asString(), description.asString());
                                 break;
                         }

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordApplicationCommandScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordApplicationCommandScriptEvent.java
@@ -91,6 +91,8 @@ public ObjectTag getContext(String name) {
                             result = new ElementTag(mapping.getAsString()); break;
                         case BOOLEAN: result = new ElementTag(mapping.getAsBoolean()); break;
                         case INTEGER: result = new ElementTag(mapping.getAsLong()); break;
+                        case NUMBER: result = new ElementTag(mapping.getAsDouble()); break;
+                        case ATTACHMENT: result = new ElementTag(mapping.getAsAttachment().getUrl()); break;
                         case CHANNEL: result = new DiscordChannelTag(botID, mapping.getAsMessageChannel()); break;
                         case MENTIONABLE: {
                             String mention = mapping.getAsMentionable().getAsMention();

diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordInteractionTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordInteractionTag.java
@@ -18,6 +18,7 @@
 import com.denizenscript.denizencore.utilities.scheduling.OneTimeSchedulable;
 import net.dv8tion.jda.api.entities.PrivateChannel;
 import net.dv8tion.jda.api.interactions.Interaction;
+import net.dv8tion.jda.api.interactions.commands.context.MessageContextInteraction;
 import net.dv8tion.jda.api.interactions.commands.context.UserContextInteraction;
 
 import java.util.HashMap;
@@ -200,20 +201,33 @@ public static void registerTags() {
             return new DiscordUserTag(object.bot, object.interaction.getUser());
         });
 
-
         // <--[tag]
         // @attribute <DiscordInteractionTag.target_user>
         // @returns DiscordUserTag
         // @plugin dDiscordBot
         // @description
-        // Returns the user being targeted by the interaction.
+        // Returns the user being targeted by a USER application interaction.
         // -->
         tagProcessor.registerTag(DiscordUserTag.class, "target_user", (attribute, object) -> {
             if (object.interaction instanceof UserContextInteraction) {
                 return new DiscordUserTag(object.bot, ((UserContextInteraction) object.interaction).getTarget());
             }
             return null;
         });
+
+        // <--[tag]
+        // @attribute <DiscordInteractionTag.target_message>
+        // @returns DiscordMessageTag
+        // @plugin dDiscordBot
+        // @description
+        // Returns the message being targeted by a MESSAGE application interaction.
+        // -->
+        tagProcessor.registerTag(DiscordMessageTag.class, "target_message", (attribute, object) -> {
+            if (object.interaction instanceof MessageContextInteraction) {
+                return new DiscordMessageTag(object.bot, ((MessageContextInteraction) object.interaction).getTarget());
+            }
+            return null;
+        });
     }
 
     public static ObjectTagProcessor<DiscordInteractionTag> tagProcessor = new ObjectTagProcessor<>();