DiscordEmbedTag

DenizenScript · Jul 22, 2020 · 10b0eea · 10b0eea
1 parent 737a8db
commit 10b0eea
Show file tree

Hide file tree

Showing 3 changed files with 419 additions and 10 deletions.
diff --git a/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java b/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java
@@ -34,8 +34,9 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(DiscordUserJoinsScriptEvent.instance = new DiscordUserJoinsScriptEvent());
             ScriptEvent.registerScriptEvent(DiscordUserLeavesScriptEvent.instance = new DiscordUserLeavesScriptEvent());
             ScriptEvent.registerScriptEvent(DiscordUserRoleChangeScriptEvent.instance = new DiscordUserRoleChangeScriptEvent());
-            ObjectFetcher.registerWithObjectFetcher(DiscordChannelTag.class, DiscordChannelTag.tagProcessor);
             ObjectFetcher.registerWithObjectFetcher(DiscordBotTag.class, DiscordBotTag.tagProcessor);
+            ObjectFetcher.registerWithObjectFetcher(DiscordChannelTag.class, DiscordChannelTag.tagProcessor);
+            ObjectFetcher.registerWithObjectFetcher(DiscordEmbedTag.class, DiscordEmbedTag.tagProcessor);
             ObjectFetcher.registerWithObjectFetcher(DiscordGroupTag.class, DiscordGroupTag.tagProcessor);
             ObjectFetcher.registerWithObjectFetcher(DiscordRoleTag.class, DiscordRoleTag.tagProcessor);
             ObjectFetcher.registerWithObjectFetcher(DiscordUserTag.class, DiscordUserTag.tagProcessor);
@@ -45,23 +46,41 @@ public void run(ReplaceableTagEvent event) {
                     discordTagBase(event);
                 }
             }, "discord");
+            TagManager.registerTagHandler(new TagRunnable.RootForm() {
+                @Override
+                public void run(ReplaceableTagEvent event) {
+                    discordEmbedTagBase(event);
+                }
+            }, "discord_embed");
         }
         catch (Throwable ex) {
             Debug.echoError(ex);
         }
     }
 
+    public void discordEmbedTagBase(ReplaceableTagEvent event) {
+        if (!event.matches("discord_embed") || event.replaced()) {
+            return;
+        }
+        DiscordEmbedTag embed;
+        if (event.hasNameContext()) {
+            embed = DiscordEmbedTag.valueOf(event.getNameContext(), event.getAttributes().context);
+        }
+        else {
+            embed = new DiscordEmbedTag();
+        }
+        Attribute attribute = event.getAttributes().fulfill(1);
+        event.setReplacedObject(CoreUtilities.autoAttrib(embed, attribute));
+    }
+
     public void discordTagBase(ReplaceableTagEvent event) {
         if (!event.matches("discord") || event.replaced()) {
             return;
         }
-
         DiscordBotTag bot = null;
-
         if (event.hasNameContext()) {
             bot = DiscordBotTag.valueOf(event.getNameContext(), event.getAttributes().context);
         }
-
         Attribute attribute = event.getAttributes().fulfill(1);
 
         // <--[tag]

diff --git a/src/main/java/com/denizenscript/ddiscordbot/DiscordCommand.java b/src/main/java/com/denizenscript/ddiscordbot/DiscordCommand.java
@@ -1,9 +1,6 @@
 package com.denizenscript.ddiscordbot;
 
-import com.denizenscript.ddiscordbot.objects.DiscordChannelTag;
-import com.denizenscript.ddiscordbot.objects.DiscordGroupTag;
-import com.denizenscript.ddiscordbot.objects.DiscordRoleTag;
-import com.denizenscript.ddiscordbot.objects.DiscordUserTag;
+import com.denizenscript.ddiscordbot.objects.*;
 import com.denizenscript.denizencore.objects.Argument;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
@@ -72,6 +69,10 @@ public DiscordCommand() {
     // - ~discord id:mybot message channel:<discord[mybot].group[Denizen].channel[bot-spam]> "Hello world!"
     //
     // @Usage
+    // Use to message an embed to a Discord channel.
+    // - ~discord id:mybot message channel:<discord[mybot].group[Denizen].channel[bot-spam]> "<discord_embed.with[title].as[hi].with[description].as[This is an embed!]>"
+    //
+    // @Usage
     // Use to message a Discord channel and record the ID.
     // - ~discord id:mybot message channel:<discord[mybot].group[Denizen].channel[bot-spam]> "Hello world!" save:sent
     // - announce "Sent as <entry[sent].message_id>"
@@ -344,7 +345,14 @@ public void execute(ScriptEntry scriptEntry) {
                     else {
                         textChan = client.getTextChannelById(channel.channel_id);
                     }
-                    Message sentMessage = textChan.sendMessage(message.asString()).complete();
+                    Message sentMessage;
+                    if (message.asString().startsWith("discordembed@")) {
+                        MessageEmbed embed = DiscordEmbedTag.valueOf(message.asString(), scriptEntry.context).build(scriptEntry.context).build();
+                        sentMessage = textChan.sendMessage(embed).complete();
+                    }
+                    else {
+                        sentMessage = textChan.sendMessage(message.asString()).complete();
+                    }
                     scriptEntry.addObject("message_id", new ElementTag(sentMessage.getId()));
                     scriptEntry.setFinished(true);
                     break;
@@ -385,7 +393,14 @@ public void execute(ScriptEntry scriptEntry) {
                     if (requireClientObject.apply(client)) {
                         return;
                     }
-                    client.getTextChannelById(channel.channel_id).editMessageById(messageId.asLong(), message.asString()).complete();
+                    MessageChannel textChannel = client.getTextChannelById(channel.channel_id);
+                    if (message.asString().startsWith("discordembed@")) {
+                        MessageEmbed embed = DiscordEmbedTag.valueOf(message.asString(), scriptEntry.context).build(scriptEntry.context).build();
+                        textChannel.editMessageById(messageId.asLong(), embed).complete();
+                    }
+                    else {
+                        textChannel.editMessageById(messageId.asLong(), message.asString()).complete();
+                    }
                     scriptEntry.setFinished(true);
                     break;
                 }