discord event meta: label the object type

DenizenScript · Feb 3, 2022 · 36475a2 · 36475a2
1 parent 3b5d7be
commit 36475a2
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 66 deletions.
diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordButtonClickedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordButtonClickedScriptEvent.java
@@ -26,11 +26,11 @@ public class DiscordButtonClickedScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
-    // <context.interaction> returns the interaction.
-    // <context.button> returns the button.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.interaction> returns the DiscordInteractionTag.
+    // <context.button> returns the DiscordButtonTag.
     //
     // -->
 

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordChannelCreateScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordChannelCreateScriptEvent.java
@@ -23,9 +23,9 @@ public class DiscordChannelCreateScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.channel> returns the new channel.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.channel> returns the new DiscordChannelTag.
     // -->
 
     public static DiscordChannelCreateScriptEvent instance;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordChannelDeleteScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordChannelDeleteScriptEvent.java
@@ -22,9 +22,9 @@ public class DiscordChannelDeleteScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.channel> returns the new channel.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.channel> returns the DiscordChannelTag.
     // -->
 
     public static DiscordChannelDeleteScriptEvent instance;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageDeletedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageDeletedScriptEvent.java
@@ -30,9 +30,9 @@ public class DiscordMessageDeletedScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
     // <context.old_message_valid> returns whether the old message is available (it may be lost due to caching).
     // <context.old_message> returns the original DiscordMessageTag (data may be missing if not cached).
     //

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageModifiedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageModifiedScriptEvent.java
@@ -32,9 +32,9 @@ public class DiscordMessageModifiedScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
     // <context.new_message> returns the message as it now exists, as a DiscordMessageTag.
     // <context.old_message_valid> returns whether the old message is available (it may be lost due to caching).
     // <context.old_message> returns the original DiscordMessageTag (data may be missing if not cached).

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageReactionAddScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageReactionAddScriptEvent.java
@@ -22,9 +22,9 @@ public class DiscordMessageReactionAddScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
     // <context.message> returns the message.
     // <context.user> returns the user that added the reaction.
     // <context.reaction> returns the new reaction.

diff --git a/...in/java/com/denizenscript/ddiscordbot/events/DiscordMessageReactionRemoveScriptEvent.java b/...in/java/com/denizenscript/ddiscordbot/events/DiscordMessageReactionRemoveScriptEvent.java
@@ -22,12 +22,12 @@ public class DiscordMessageReactionRemoveScriptEvent extends DiscordScriptEvent
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
-    // <context.message> returns the message.
-    // <context.user> returns the user that removed the reaction.
-    // <context.reaction> returns the old reaction.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.message> returns the DiscordMessageTag.
+    // <context.user> returns the DiscordUserTag that removed the reaction.
+    // <context.reaction> returns the old DiscordReactionTag.
     //
     // -->
 

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageReceivedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordMessageReceivedScriptEvent.java
@@ -32,9 +32,9 @@ public class DiscordMessageReceivedScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
     // <context.new_message> returns the message received, as a DiscordMessageTag.
     //
     // -->

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordSelectionUsedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordSelectionUsedScriptEvent.java
@@ -26,12 +26,12 @@ public class DiscordSelectionUsedScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
-    // <context.interaction> returns the interaction.
-    // <context.menu> returns the selection menu.
-    // <context.option> returns the selected option.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.interaction> returns the DiscordInteractionTag.
+    // <context.menu> returns the selection menu as a DiscordSelectionTag.
+    // <context.option> returns the selected option as a MapTag.
     //
     // -->
 

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordSlashCommandScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordSlashCommandScriptEvent.java
@@ -35,12 +35,12 @@ public class DiscordSlashCommandScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.channel> returns the channel.
-    // <context.group> returns the group.
-    // <context.interaction> returns the interaction.
-    // <context.command> returns the command.
-    // <context.options> returns the supplied options.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.channel> returns the DiscordChannelTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.interaction> returns the DiscordInteractionTag.
+    // <context.command> returns the DiscordCommandTag.
+    // <context.options> returns the supplied options as a MapTag.
     //
     // -->
 
@@ -85,7 +85,7 @@ public ObjectTag getContext(String name) {
             case "command":
                 return new DiscordCommandTag(botID, getEvent().isFromGuild() ? getEvent().getGuild().getIdLong() : 0, getEvent().getCommandIdLong());
             case "options": {
-                Map<StringHolder, ObjectTag> options = new HashMap<>();
+                MapTag options = new MapTag();
                 for (OptionMapping mapping : getEvent().getOptions()) {
                     ObjectTag result;
                     switch (mapping.getType()) {
@@ -110,9 +110,9 @@ public ObjectTag getContext(String name) {
                         case USER: result = new DiscordUserTag(botID, mapping.getAsUser()); break;
                         default: result = new ElementTag(botID, null);
                     }
-                    options.put(new StringHolder(mapping.getName()), result);
+                    options.putObject(mapping.getName(), result);
                 }
-                return new MapTag(options);
+                return options;
             }
         }
 

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordThreadArchivedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordThreadArchivedScriptEvent.java
@@ -25,9 +25,9 @@ public class DiscordThreadArchivedScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.thread> returns the thread channel.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.thread> returns the thread DiscordChannelTag.
     // -->
 
     public static DiscordThreadArchivedScriptEvent instance;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordThreadRevealedScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordThreadRevealedScriptEvent.java
@@ -25,9 +25,9 @@ public class DiscordThreadRevealedScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.thread> returns the thread channel.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.thread> returns the thread DiscordChannelTag.
     // -->
 
     public static DiscordThreadRevealedScriptEvent instance;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserJoinsScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserJoinsScriptEvent.java
@@ -22,9 +22,9 @@ public class DiscordUserJoinsScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.user> returns the user.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.user> returns the DiscordUserTag.
     // -->
 
     public static DiscordUserJoinsScriptEvent instance;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserLeavesScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserLeavesScriptEvent.java
@@ -22,9 +22,9 @@ public class DiscordUserLeavesScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.user> returns the user.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.user> returns the DiscordUserTag.
     // -->
 
     public static DiscordUserLeavesScriptEvent instance;

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserNicknameChangeScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserNicknameChangeScriptEvent.java
@@ -23,9 +23,9 @@ public class DiscordUserNicknameChangeScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.user> returns the user.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.user> returns the DiscordUserTag.
     // <context.old_name> returns the user's previous nickname (if any).
     // <context.new_name> returns the user's new nickname (if any).
     // -->

diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserRoleChangeScriptEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUserRoleChangeScriptEvent.java
@@ -29,13 +29,13 @@ public class DiscordUserRoleChangeScriptEvent extends DiscordScriptEvent {
     // @Group Discord
     //
     // @Context
-    // <context.bot> returns the relevant Discord bot object.
-    // <context.group> returns the group.
-    // <context.user> returns the user.
-    // <context.old_roles> returns a list of the user's previous role set.
-    // <context.new_roles> returns a list of the user's new role set.
-    // <context.added_roles> returns a list of the user's added role set.
-    // <context.removed_roles> returns a list of the user's removed role set.
+    // <context.bot> returns the relevant DiscordBotTag.
+    // <context.group> returns the DiscordGroupTag.
+    // <context.user> returns the DiscordUserTag.
+    // <context.old_roles> returns a ListTag of the user's previous DiscordRoleTag set.
+    // <context.new_roles> returns a ListTag of the user's new DiscordRoleTag set.
+    // <context.added_roles> returns a ListTag of the user's added DiscordRoleTag set.
+    // <context.removed_roles> returns a ListTag of the user's removed DiscordRoleTag set.
     // -->
 
     public static DiscordUserRoleChangeScriptEvent instance;