From d71759d1fb69387153d85a418ad63e8e4cd4afdb Mon Sep 17 00:00:00 2001 From: MrMaleficus Date: Sat, 7 Dec 2024 12:20:52 +0100 Subject: [PATCH 01/11] DiscordUserTag.is_boosting --- .../ddiscordbot/objects/DiscordUserTag.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java index c7dab31..01d68e8 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java @@ -240,6 +240,31 @@ public static void register() { return new ElementTag(object.getUser().isBot()); }); + // <--[tag] + // @attribute ]> + // @returns ElementTag(Boolean) + // @plugin dDiscordBot + // @description + // Returns a boolean indicating whether the user is boosting the specified server or not. + // --> + tagProcessor.registerTag(ElementTag.class, "is_boosting", (attribute, object) -> { + if (!attribute.hasParam()) { + return null; + } + DiscordGroupTag group = attribute.paramAsType(DiscordGroupTag.class); + if (group == null) { + return null; + } + if (object.getUserForTag(attribute) == null) { + return null; + } + Member member = group.getGuild().getMember(object.getUser()); + if (member == null) { + return null; + } + return new ElementTag(member.isBoosting()); + }); + // <--[tag] // @attribute // @returns ElementTag From d482df33cd48255afc48a47c67eb55a842b9ea83 Mon Sep 17 00:00:00 2001 From: MrMaleficus Date: Sat, 7 Dec 2024 13:08:38 +0100 Subject: [PATCH 02/11] DiscordUpdateBoostCountEvent --- .../ddiscordbot/DenizenDiscordBot.java | 1 + .../ddiscordbot/DiscordConnection.java | 6 ++ .../events/DiscordUpdateBoostCountEvent.java | 59 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java diff --git a/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java b/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java index 54f8cd3..bab5310 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java +++ b/src/main/java/com/denizenscript/ddiscordbot/DenizenDiscordBot.java @@ -77,6 +77,7 @@ public void onEnable() { ScriptEvent.registerScriptEvent(DiscordSelectionUsedScriptEvent.class); ScriptEvent.registerScriptEvent(DiscordThreadArchivedScriptEvent.class); ScriptEvent.registerScriptEvent(DiscordThreadRevealedScriptEvent.class); + ScriptEvent.registerScriptEvent(DiscordUpdateBoostCountEvent.class); ScriptEvent.registerScriptEvent(DiscordUserJoinsScriptEvent.class); ScriptEvent.registerScriptEvent(DiscordUserLeavesScriptEvent.class); ScriptEvent.registerScriptEvent(DiscordUserNicknameChangeScriptEvent.class); diff --git a/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java b/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java index 9c9b034..fb4262c 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java +++ b/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java @@ -14,6 +14,7 @@ import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent; import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent; import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateNicknameEvent; +import net.dv8tion.jda.api.events.guild.update.GuildUpdateBoostCountEvent; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; @@ -115,6 +116,11 @@ public void onGuildMemberRemove(GuildMemberRemoveEvent event) { autoHandle(event, DiscordUserLeavesScriptEvent.instance); } + @Override + public void onGuildUpdateBoostCount(GuildUpdateBoostCountEvent event) { + autoHandle(event, DiscordUpdateBoostCountEvent.instance); + } + @Override public void onGuildMemberRoleAdd(GuildMemberRoleAddEvent event) { autoHandle(event, DiscordUserRoleChangeScriptEvent.instance); diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java new file mode 100644 index 0000000..f04319f --- /dev/null +++ b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java @@ -0,0 +1,59 @@ +package com.denizenscript.ddiscordbot.events; + +import com.denizenscript.ddiscordbot.DiscordScriptEvent; +import com.denizenscript.ddiscordbot.objects.DiscordGroupTag; +import com.denizenscript.ddiscordbot.objects.DiscordUserTag; +import com.denizenscript.denizencore.objects.ObjectTag; +import net.dv8tion.jda.api.events.guild.update.GuildUpdateBoostCountEvent; + +public class DiscordUpdateBoostCountEvent extends DiscordScriptEvent { + + // <--[event] + // @Events + // discord boosts count changes + // + // @Switch for: to only process the event for a specified Discord bot. + // @Switch group: to only process the event for a specified Discord group. + // + // @Triggers when the boosts count of the server changes + // + // @Plugin dDiscordBot + // + // @Group Discord + // + // @Context + // returns the relevant DiscordBotTag. + // returns the DiscordGroupTag. + // returns the new count of the group's boosts. + // returns the old count of the group's boosts. + // --> + + public static DiscordUpdateBoostCountEvent instance; + + public DiscordUpdateBoostCountEvent() { + instance = this; + registerCouldMatcher("discord boosts count changes"); + registerSwitches("group"); + } + + public GuildUpdateBoostCountEvent getEvent() { + return (GuildUpdateBoostCountEvent) event; + } + + @Override + public boolean matches(ScriptPath path) { + if (!tryGuild(path, getEvent().getGuild())) { + return false; + } + return super.matches(path); + } + + @Override + public ObjectTag getContext(String name) { + return switch (name) { + case "new_count" -> new DiscordGroupTag(botID, getEvent().getNewBoostCount()); + case "old_count" -> new DiscordUserTag(botID, getEvent().getOldBoostCount()); + default -> super.getContext(name); + }; + } +} From 9644fd98b3c6b802d1d75dd70f146eeacfc2d6fe Mon Sep 17 00:00:00 2001 From: MrMaleficus Date: Sat, 7 Dec 2024 13:09:28 +0100 Subject: [PATCH 03/11] boosters, boosts_count, tier --- .../ddiscordbot/objects/DiscordGroupTag.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java index 9e49c4a..da237f1 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java @@ -189,6 +189,43 @@ public static void register() { return list; }); + // <--[tag] + // @attribute + // @returns ListTag(DiscordUserTag) + // @plugin dDiscordBot + // @description + // Returns a list of all users in the group that currently boosts the server. + // --> + tagProcessor.registerTag(ListTag.class, "boosters", (attribute, object) -> { + ListTag list = new ListTag(); + for (Member member : object.getGuild().getBoosters()) { + list.addObject(new DiscordUserTag(object.bot, member.getUser())); + } + return list; + }); + + // <--[tag] + // @attribute + // @returns ElementTag(Number) + // @plugin dDiscordBot + // @description + // Returns the amount of boosts the group currently has. + // --> + tagProcessor.registerTag(ElementTag.class, "boosts_count", (attribute, object) -> { + return new ElementTag(object.getGuild().getBoostCount()); + }); + + // <--[tag] + // @attribute + // @returns ElementTag(Number) + // @plugin dDiscordBot + // @description + // Returns the tier (0 to 3) of the group currently set by its boosts. + // --> + tagProcessor.registerTag(ElementTag.class, "tier", (attribute, object) -> { + return new ElementTag(object.getGuild().getBoostTier()); + }); + // <--[tag] // @attribute // @returns ListTag(DiscordUserTag) From a724eae52bb212e1641e18dda8607e6fb5824f26 Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Sun, 29 Dec 2024 11:33:21 +0100 Subject: [PATCH 04/11] meta fixes --- .../ddiscordbot/events/DiscordUpdateBoostCountEvent.java | 4 ++-- .../denizenscript/ddiscordbot/objects/DiscordGroupTag.java | 2 +- .../com/denizenscript/ddiscordbot/objects/DiscordUserTag.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java index f04319f..3db70a4 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java +++ b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java @@ -24,8 +24,8 @@ public class DiscordUpdateBoostCountEvent extends DiscordScriptEvent { // @Context // returns the relevant DiscordBotTag. // returns the DiscordGroupTag. - // returns the new count of the group's boosts. - // returns the old count of the group's boosts. + // returns the new amount of boosts of the group. + // returns the old amount of boosts of the group. // --> public static DiscordUpdateBoostCountEvent instance; diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java index da237f1..7ba06dc 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java @@ -194,7 +194,7 @@ public static void register() { // @returns ListTag(DiscordUserTag) // @plugin dDiscordBot // @description - // Returns a list of all users in the group that currently boosts the server. + // Returns a list of all users in the group that currently boosts the group. // --> tagProcessor.registerTag(ListTag.class, "boosters", (attribute, object) -> { ListTag list = new ListTag(); diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java index 01d68e8..bcb99a2 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java @@ -245,7 +245,7 @@ public static void register() { // @returns ElementTag(Boolean) // @plugin dDiscordBot // @description - // Returns a boolean indicating whether the user is boosting the specified server or not. + // Returns a boolean indicating whether the user is boosting the specified group or not. // --> tagProcessor.registerTag(ElementTag.class, "is_boosting", (attribute, object) -> { if (!attribute.hasParam()) { From dd0e2b505ac03be762b0631f520b5c0297f35321 Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Sun, 29 Dec 2024 11:36:49 +0100 Subject: [PATCH 05/11] Update DiscordConnection.java --- .../denizenscript/ddiscordbot/DiscordConnection.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java b/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java index fb4262c..09fd1de 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java +++ b/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java @@ -116,11 +116,6 @@ public void onGuildMemberRemove(GuildMemberRemoveEvent event) { autoHandle(event, DiscordUserLeavesScriptEvent.instance); } - @Override - public void onGuildUpdateBoostCount(GuildUpdateBoostCountEvent event) { - autoHandle(event, DiscordUpdateBoostCountEvent.instance); - } - @Override public void onGuildMemberRoleAdd(GuildMemberRoleAddEvent event) { autoHandle(event, DiscordUserRoleChangeScriptEvent.instance); @@ -136,6 +131,11 @@ public void onGuildMemberUpdateNickname(GuildMemberUpdateNicknameEvent event) { autoHandle(event, DiscordUserNicknameChangeScriptEvent.instance); } + @Override + public void onGuildUpdateBoostCount(GuildUpdateBoostCountEvent event) { + autoHandle(event, DiscordUpdateBoostCountEvent.instance); + } + @Override public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { autoHandle(event, DiscordApplicationCommandScriptEvent.instance); From f83aa0e6e4a45e77e6ba782ea23aba717cdc48ca Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Sun, 29 Dec 2024 11:37:50 +0100 Subject: [PATCH 06/11] Update DiscordConnection.java --- .../java/com/denizenscript/ddiscordbot/DiscordConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java b/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java index 09fd1de..5d09491 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java +++ b/src/main/java/com/denizenscript/ddiscordbot/DiscordConnection.java @@ -135,7 +135,7 @@ public void onGuildMemberUpdateNickname(GuildMemberUpdateNicknameEvent event) { public void onGuildUpdateBoostCount(GuildUpdateBoostCountEvent event) { autoHandle(event, DiscordUpdateBoostCountEvent.instance); } - + @Override public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { autoHandle(event, DiscordApplicationCommandScriptEvent.instance); From 1bfc939b70dde26d205482947b146feb50bd6c54 Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Sun, 29 Dec 2024 11:48:48 +0100 Subject: [PATCH 07/11] update docs --- .../com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java | 3 ++- .../com/denizenscript/ddiscordbot/objects/DiscordRoleTag.java | 2 +- .../com/denizenscript/ddiscordbot/objects/DiscordUserTag.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java index 7ba06dc..5d9a6e0 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java @@ -220,7 +220,8 @@ public static void register() { // @returns ElementTag(Number) // @plugin dDiscordBot // @description - // Returns the tier (0 to 3) of the group currently set by its boosts. + // Returns the tier of the group currently set by its boosts. + // You can get a list of possible outputs here: <@link url https://docs.jda.wiki/net/dv8tion/jda/api/entities/Guild.BoostTier.html> // --> tagProcessor.registerTag(ElementTag.class, "tier", (attribute, object) -> { return new ElementTag(object.getGuild().getBoostTier()); diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordRoleTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordRoleTag.java index eba8479..4a8adf8 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordRoleTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordRoleTag.java @@ -245,7 +245,7 @@ public static void register() { // @returns ListTag // @plugin dDiscordBot // @description - // Returns a list of permissions that the role provides for users. You can get a list of possible outputs here: <@link url https://ci.dv8tion.net/job/JDA5/javadoc/net/dv8tion/jda/api/Permission.html> + // Returns a list of permissions that the role provides for users. You can get a list of possible outputs here: <@link url https://docs.jda.wiki/net/dv8tion/jda/api/Permission.html> // --> tagProcessor.registerTag(ListTag.class, "permissions", (attribute, object) -> { ListTag list = new ListTag(); diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java index bcb99a2..765097e 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java @@ -482,7 +482,7 @@ public static void register() { // @returns ListTag // @plugin dDiscordBot // @description - // Returns a list of permissions that the user has in a certain group. You can get a list of possible outputs here: <@link url https://ci.dv8tion.net/job/JDA5/javadoc/net/dv8tion/jda/api/Permission.html> + // Returns a list of permissions that the user has in a certain group. You can get a list of possible outputs here: <@link url https://docs.jda.wiki/net/dv8tion/jda/api/Permission.html> // --> tagProcessor.registerTag(ListTag.class, "permissions", (attribute, object) -> { if (!attribute.hasParam()) { From 38b308a6231aab68b3ca6726225321a8993130ad Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Sun, 29 Dec 2024 12:17:16 +0100 Subject: [PATCH 08/11] upgrades from review --- .../ddiscordbot/objects/DiscordUserTag.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java index 765097e..42cd8d7 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java @@ -247,21 +247,11 @@ public static void register() { // @description // Returns a boolean indicating whether the user is boosting the specified group or not. // --> - tagProcessor.registerTag(ElementTag.class, "is_boosting", (attribute, object) -> { - if (!attribute.hasParam()) { - return null; - } - DiscordGroupTag group = attribute.paramAsType(DiscordGroupTag.class); - if (group == null) { - return null; - } - if (object.getUserForTag(attribute) == null) { - return null; + tagProcessor.registerTag(ElementTag.class, DiscordGroupTag.class, "is_boosting", (attribute, object, group) -> { + if (object.getUser() == null) { + return new ElementTag(false); } Member member = group.getGuild().getMember(object.getUser()); - if (member == null) { - return null; - } return new ElementTag(member.isBoosting()); }); From cbdbb553711ad60e004af6955fdc90a849730292 Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Sun, 29 Dec 2024 12:33:11 +0100 Subject: [PATCH 09/11] Update DiscordUpdateBoostCountEvent.java --- .../ddiscordbot/events/DiscordUpdateBoostCountEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java index 3db70a4..a0b2859 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java +++ b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java @@ -52,7 +52,7 @@ public boolean matches(ScriptPath path) { public ObjectTag getContext(String name) { return switch (name) { case "new_count" -> new DiscordGroupTag(botID, getEvent().getNewBoostCount()); - case "old_count" -> new DiscordUserTag(botID, getEvent().getOldBoostCount()); + case "old_count" -> new DiscordGroupTag(botID, getEvent().getOldBoostCount()); default -> super.getContext(name); }; } From 8e2ead3937b1c073a8fbbf42d96764bdf1168702 Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Mon, 13 Jan 2025 00:01:05 +0100 Subject: [PATCH 10/11] fixes from review --- .../events/DiscordUpdateBoostCountEvent.java | 7 ++++--- .../ddiscordbot/objects/DiscordGroupTag.java | 15 ++++++--------- .../ddiscordbot/objects/DiscordUserTag.java | 6 +++--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java index a0b2859..50639a4 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java +++ b/src/main/java/com/denizenscript/ddiscordbot/events/DiscordUpdateBoostCountEvent.java @@ -23,9 +23,9 @@ public class DiscordUpdateBoostCountEvent extends DiscordScriptEvent { // // @Context // returns the relevant DiscordBotTag. - // returns the DiscordGroupTag. - // returns the new amount of boosts of the group. - // returns the old amount of boosts of the group. + // returns the DiscordGroupTag whose boost count changed. + // returns the group's new new amount of boosts. + // returns the group's old amount of boosts. // --> public static DiscordUpdateBoostCountEvent instance; @@ -51,6 +51,7 @@ public boolean matches(ScriptPath path) { @Override public ObjectTag getContext(String name) { return switch (name) { + case "group" -> new DiscordGroupTag(botID, getEvent().getGuild()); case "new_count" -> new DiscordGroupTag(botID, getEvent().getNewBoostCount()); case "old_count" -> new DiscordGroupTag(botID, getEvent().getOldBoostCount()); default -> super.getContext(name); diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java index 5d9a6e0..5af760d 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java @@ -194,14 +194,11 @@ public static void register() { // @returns ListTag(DiscordUserTag) // @plugin dDiscordBot // @description - // Returns a list of all users in the group that currently boosts the group. + // Returns a list of all users in the group that currently boosts it. // --> tagProcessor.registerTag(ListTag.class, "boosters", (attribute, object) -> { - ListTag list = new ListTag(); - for (Member member : object.getGuild().getBoosters()) { - list.addObject(new DiscordUserTag(object.bot, member.getUser())); - } - return list; + List boosters = object.getGuild().getBoosters(); + return new ListTag(boosters, member -> new DiscordUserTag(object.bot, member.getUser())); }); // <--[tag] @@ -216,14 +213,14 @@ public static void register() { }); // <--[tag] - // @attribute - // @returns ElementTag(Number) + // @attribute + // @returns ElementTag // @plugin dDiscordBot // @description // Returns the tier of the group currently set by its boosts. // You can get a list of possible outputs here: <@link url https://docs.jda.wiki/net/dv8tion/jda/api/entities/Guild.BoostTier.html> // --> - tagProcessor.registerTag(ElementTag.class, "tier", (attribute, object) -> { + tagProcessor.registerTag(ElementTag.class, "boost_tier", (attribute, object) -> { return new ElementTag(object.getGuild().getBoostTier()); }); diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java index 42cd8d7..32e864d 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordUserTag.java @@ -231,7 +231,7 @@ public static void register() { // @returns ElementTag(Boolean) // @plugin dDiscordBot // @description - // Returns a boolean indicating whether the user is a bot. + // Returns whether the user is a bot or not. // --> tagProcessor.registerTag(ElementTag.class, "is_bot", (attribute, object) -> { if (object.getUserForTag(attribute) == null) { @@ -245,10 +245,10 @@ public static void register() { // @returns ElementTag(Boolean) // @plugin dDiscordBot // @description - // Returns a boolean indicating whether the user is boosting the specified group or not. + // Return whether the user is boosting the specified group or not. // --> tagProcessor.registerTag(ElementTag.class, DiscordGroupTag.class, "is_boosting", (attribute, object, group) -> { - if (object.getUser() == null) { + if (object.getUserForTag(attribute) == null) { return new ElementTag(false); } Member member = group.getGuild().getMember(object.getUser()); From c32b766f369aae4ecb27b18ce243e0cd3a277f0b Mon Sep 17 00:00:00 2001 From: Maxime Moisant Date: Mon, 13 Jan 2025 00:08:55 +0100 Subject: [PATCH 11/11] Update DiscordGroupTag.java --- .../com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java index 5af760d..12024b3 100644 --- a/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java +++ b/src/main/java/com/denizenscript/ddiscordbot/objects/DiscordGroupTag.java @@ -217,7 +217,7 @@ public static void register() { // @returns ElementTag // @plugin dDiscordBot // @description - // Returns the tier of the group currently set by its boosts. + // Returns the current tier of the group set by its boosts. // You can get a list of possible outputs here: <@link url https://docs.jda.wiki/net/dv8tion/jda/api/entities/Guild.BoostTier.html> // --> tagProcessor.registerTag(ElementTag.class, "boost_tier", (attribute, object) -> {