Skip to content

Commit 00cd2a4

Browse files
ANutleyANutley
committed
chore: update JDA
1 parent 95bbee3 commit 00cd2a4

File tree

20 files changed

+121
-106
lines changed

20 files changed

+121
-106
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ allprojects {
88
ext {
99
dependencies {
1010
// Creates shortcuts to avoid repeating dependencies throughout modules
11-
jda = { [group: 'net.dv8tion', name: 'JDA', version: "5.0.0-alpha.17"] }
11+
jda = { [group: 'net.dv8tion', name: 'JDA', version: "5.0.2"] }
1212
logback = { [group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.11'] }
1313
reflections = { [group: 'org.reflections', name: 'reflections', version: '0.10.2'] }
1414

‎commands/src/main/java/me/anutley/jdautils/commands/CommandListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import me.anutley.jdautils.commands.events.*;
88
import me.anutley.jdautils.commands.text.TextCommand;
99
import net.dv8tion.jda.api.Permission;
10-
import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
10+
import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildMessageChannel;
1111
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
1212
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1313
import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;

‎commands/src/main/java/me/anutley/jdautils/commands/SlashCommandManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import me.anutley.jdautils.commands.application.slash.SlashCommand;
66
import me.anutley.jdautils.commands.application.slash.SlashCommandOption;
77
import me.anutley.jdautils.commands.application.slash.annotations.JDASlashCommand;
8-
import net.dv8tion.jda.api.entities.ChannelType;
8+
import net.dv8tion.jda.api.entities.channel.ChannelType;
99
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1010
import net.dv8tion.jda.api.interactions.commands.Command;
1111
import net.dv8tion.jda.api.interactions.commands.OptionType;
@@ -148,7 +148,7 @@ public List<ApplicationCommandData> getCommandData() {
148148
*/
149149
public SlashCommand getCommandFromEvent(SlashCommandInteractionEvent event) {
150150

151-
return this.commands.stream().filter(slashCommand -> slashCommand.getAnnotation().name().equals(event.getCommandPath()))
151+
return this.commands.stream().filter(slashCommand -> slashCommand.getAnnotation().name().equals(event.getFullCommandName()))
152152
.findFirst()
153153
.orElse(null);
154154
}

‎commands/src/main/java/me/anutley/jdautils/commands/application/slash/SlashCommand.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
import me.anutley.jdautils.commands.annotations.CommandMeta;
55
import me.anutley.jdautils.commands.application.slash.annotations.JDASlashCommand;
66
import me.anutley.jdautils.commands.events.SlashCommandEvent;
7-
import net.dv8tion.jda.api.entities.*;
7+
import net.dv8tion.jda.api.entities.Member;
8+
import net.dv8tion.jda.api.entities.User;
9+
import net.dv8tion.jda.api.entities.channel.concrete.*;
10+
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
811
import net.dv8tion.jda.api.entities.channel.unions.GuildChannelUnion;
912
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1013
import net.dv8tion.jda.api.interactions.commands.OptionMapping;

‎commands/src/main/java/me/anutley/jdautils/commands/application/slash/annotations/SlashOption.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.anutley.jdautils.commands.application.slash.annotations;
22

3-
import net.dv8tion.jda.api.entities.ChannelType;
3+
import net.dv8tion.jda.api.entities.channel.ChannelType;
44
import net.dv8tion.jda.api.interactions.commands.Command.Option;
55
import net.dv8tion.jda.api.interactions.commands.OptionType;
66

‎commands/src/main/java/me/anutley/jdautils/commands/events/CommandEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import me.anutley.jdautils.commands.Command;
44
import net.dv8tion.jda.api.entities.Guild;
55
import net.dv8tion.jda.api.entities.Member;
6-
import net.dv8tion.jda.api.entities.MessageChannel;
76
import net.dv8tion.jda.api.entities.User;
7+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
88
import net.dv8tion.jda.api.events.GenericEvent;
99
import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
1010
import org.jetbrains.annotations.Nullable;

‎commands/src/main/java/me/anutley/jdautils/commands/events/MessageContextCommandEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import me.anutley.jdautils.commands.application.context.MessageContextCommand;
44
import net.dv8tion.jda.api.entities.Guild;
55
import net.dv8tion.jda.api.entities.Member;
6-
import net.dv8tion.jda.api.entities.MessageChannel;
76
import net.dv8tion.jda.api.entities.User;
7+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
88
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
99
import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
1010
import org.jetbrains.annotations.Nullable;

‎commands/src/main/java/me/anutley/jdautils/commands/events/SlashCommandEvent.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import me.anutley.jdautils.commands.application.slash.SlashCommand;
44
import net.dv8tion.jda.api.entities.Guild;
55
import net.dv8tion.jda.api.entities.Member;
6-
import net.dv8tion.jda.api.entities.MessageChannel;
76
import net.dv8tion.jda.api.entities.User;
8-
import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent;
7+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
98
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
10-
import net.dv8tion.jda.api.interactions.Interaction;
119
import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
1210
import org.jetbrains.annotations.Nullable;
1311

‎commands/src/main/java/me/anutley/jdautils/commands/events/TextCommandEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import me.anutley.jdautils.commands.text.TextCommand;
44
import net.dv8tion.jda.api.entities.Guild;
55
import net.dv8tion.jda.api.entities.Member;
6-
import net.dv8tion.jda.api.entities.MessageChannel;
76
import net.dv8tion.jda.api.entities.User;
7+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
88
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
99
import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
1010
import org.jetbrains.annotations.Nullable;

‎commands/src/main/java/me/anutley/jdautils/commands/events/UserContextCommandEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import me.anutley.jdautils.commands.application.context.UserContextCommand;
44
import net.dv8tion.jda.api.entities.Guild;
55
import net.dv8tion.jda.api.entities.Member;
6-
import net.dv8tion.jda.api.entities.MessageChannel;
76
import net.dv8tion.jda.api.entities.User;
7+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
88
import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
99
import net.dv8tion.jda.api.interactions.commands.CommandInteraction;
1010
import org.jetbrains.annotations.Nullable;

‎eventwaiter/src/main/java/me/anutley/jdautils/eventwaiter/EventWaiter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.dv8tion.jda.api.events.Event;
44
import net.dv8tion.jda.api.events.GenericEvent;
5-
import net.dv8tion.jda.api.events.ShutdownEvent;
5+
import net.dv8tion.jda.api.events.session.ShutdownEvent;
66
import net.dv8tion.jda.api.hooks.EventListener;
77
import org.jetbrains.annotations.NotNull;
88

‎examples/src/main/java/me/anutley/jdautils/examples/menus/MenuBot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static void main(String[] args) throws LoginException, InterruptedExcepti
1818
JDA jda = JDABuilder.createDefault(args[0])
1919
.setEnabledIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_EMOJIS_AND_STICKERS, GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS)
2020
.addEventListeners(waiter)
21-
.disableCache(CacheFlag.VOICE_STATE)
21+
.disableCache(CacheFlag.VOICE_STATE, CacheFlag.SCHEDULED_EVENTS)
2222
.setMemberCachePolicy(MemberCachePolicy.ALL)
2323
.build();
2424

‎examples/src/main/java/me/anutley/jdautils/examples/menus/MenuCommands.java

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
import me.anutley.jdautils.commands.application.slash.annotations.JDASlashCommand;
66
import me.anutley.jdautils.commands.events.SlashCommandEvent;
77
import me.anutley.jdautils.menus.ButtonMenu;
8-
import me.anutley.jdautils.menus.SelectionMenu;
8+
import me.anutley.jdautils.menus.StringSelectionMenu;
99
import me.anutley.jdautils.menus.paginator.ButtonPaginator;
10-
import net.dv8tion.jda.api.MessageBuilder;
1110
import net.dv8tion.jda.api.interactions.components.ActionRow;
1211
import net.dv8tion.jda.api.interactions.components.buttons.Button;
13-
import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
12+
import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
13+
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
14+
import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
1415

1516
import java.util.concurrent.TimeUnit;
1617

@@ -24,8 +25,8 @@ public void buttonPaginator(SlashCommandEvent event) {
2425
.setEventWaiter(MenuBot.waiter())
2526
.setTimeout(20)
2627
.setUnits(TimeUnit.SECONDS)
27-
.addPage(new MessageBuilder().setContent("test").build())
28-
.addPage(new MessageBuilder().setContent("test2").build())
28+
.addPage(new MessageCreateBuilder().setContent("test").build())
29+
.addPage(new MessageCreateBuilder().setContent("test2").build())
2930
.build().show(event.getDiscordEvent());
3031
}
3132

@@ -39,16 +40,26 @@ public void buttonMenu(SlashCommandEvent event) {
3940
Button.danger("cancel", "Cancel")
4041
))
4142
.setAction(aEvent -> {
43+
aEvent.deferEdit().queue();
44+
4245
if (aEvent.getButton().getId().equals("confirm")) {
43-
aEvent.getMessage().editMessage("Confirmed!").override(true).queue();
46+
aEvent.getMessage().editMessage(new MessageEditBuilder()
47+
.setContent("Confirmed")
48+
.setComponents() // clear confirm / deny buttons
49+
.build())
50+
.queue();
4451
// Do some things here
4552
} else if (aEvent.getButton().getId().equals("cancel")) {
46-
aEvent.getMessage().editMessage("Cancelled!").override(true).queue();
53+
aEvent.getMessage().editMessage(new MessageEditBuilder()
54+
.setContent("Cancelled")
55+
.setComponents() // clear confirm / deny buttons
56+
.build())
57+
.queue();
4758
// Do some other stuff here
4859
}
4960
})
5061
.setInitialMessage(
51-
new MessageBuilder().setContent("Do you want to confirm or deny?").build()
62+
new MessageCreateBuilder().setContent("Do you want to confirm or deny?").build()
5263
)
5364
.setRecursive(false)
5465
.build()
@@ -58,18 +69,16 @@ public void buttonMenu(SlashCommandEvent event) {
5869
@GuildCommand("833042350850441216")
5970
@JDASlashCommand(name = "select-menu", description = "A select menu!")
6071
public void selectMenu(SlashCommandEvent event) {
61-
new SelectionMenu.Builder()
72+
new StringSelectionMenu.Builder()
6273
.setEventWaiter(MenuBot.waiter())
6374
.addActionRows(ActionRow.of(
64-
SelectMenu.create("test")
75+
StringSelectMenu.create("test")
6576
.addOption("Cool option 1", "Cool Option 1")
6677
.addOption("Even cooler option 2", "Even Cooler Option 2")
6778
.build()
6879
)
69-
).setAction(aEvent -> {
70-
aEvent.reply(aEvent.getUser().getName() + " picked " + aEvent.getValues()).queue();
71-
})
72-
.setInitialMessage(new MessageBuilder().setContent("test").build())
80+
).setAction(aEvent -> aEvent.reply(aEvent.getUser().getName() + " picked " + aEvent.getValues()).queue())
81+
.setInitialMessage(new MessageCreateBuilder().setContent("test").build())
7382
.setEphemeral(true)
7483
.build().show(event.getDiscordEvent());
7584
}

‎menus/src/main/java/me/anutley/jdautils/menus/ButtonMenu.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package me.anutley.jdautils.menus;
22

33
import me.anutley.jdautils.eventwaiter.EventWaiter;
4-
import net.dv8tion.jda.api.MessageBuilder;
5-
import net.dv8tion.jda.api.entities.Message;
6-
import net.dv8tion.jda.api.entities.MessageChannel;
4+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
75
import net.dv8tion.jda.api.entities.Role;
86
import net.dv8tion.jda.api.entities.User;
97
import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
108
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
119
import net.dv8tion.jda.api.interactions.components.ActionRow;
10+
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
11+
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
1212

1313
import java.util.ArrayList;
1414
import java.util.Arrays;
@@ -18,11 +18,11 @@
1818

1919
public class ButtonMenu extends Menu {
2020

21-
protected final Message initialMessage;
21+
protected final MessageCreateData initialMessage;
2222
protected final Consumer<ButtonInteractionEvent> action;
2323
protected final List<ActionRow> actionRows;
2424

25-
public ButtonMenu(EventWaiter eventWaiter, List<User> allowedUsers, List<Role> allowedRoles, long timeout, TimeUnit units, boolean recursive, boolean ephemeral, Message initialMessage, Consumer<ButtonInteractionEvent> action, List<ActionRow> actionRows) {
25+
public ButtonMenu(EventWaiter eventWaiter, List<User> allowedUsers, List<Role> allowedRoles, long timeout, TimeUnit units, boolean recursive, boolean ephemeral, MessageCreateData initialMessage, Consumer<ButtonInteractionEvent> action, List<ActionRow> actionRows) {
2626
super(eventWaiter, allowedUsers, allowedRoles, timeout, units, recursive, ephemeral);
2727
this.initialMessage = initialMessage;
2828
this.action = action;
@@ -32,8 +32,8 @@ public ButtonMenu(EventWaiter eventWaiter, List<User> allowedUsers, List<Role> a
3232
@Override
3333
public void show(MessageChannel channel) {
3434
channel.sendMessage(
35-
new MessageBuilder(initialMessage)
36-
.setActionRows(actionRows)
35+
MessageCreateBuilder.from(initialMessage)
36+
.setComponents(actionRows)
3737
.build()
3838
).queue(
3939
success -> waitForClick(success.getIdLong())
@@ -43,8 +43,8 @@ public void show(MessageChannel channel) {
4343
@Override
4444
public void show(GenericCommandInteractionEvent event) {
4545
event.reply(
46-
new MessageBuilder(initialMessage)
47-
.setActionRows(actionRows)
46+
MessageCreateBuilder.from(initialMessage)
47+
.setComponents(actionRows)
4848
.build()
4949
).setEphemeral(ephemeral).queue(
5050
success -> success.retrieveOriginal().queue(m -> waitForClick(m.getIdLong()))
@@ -67,15 +67,15 @@ private void waitForClick(long messageId) {
6767

6868
public static class Builder extends Menu.Builder<Builder, ButtonMenu> {
6969

70-
protected Message initialMessage = null;
70+
protected MessageCreateData initialMessage = null;
7171
protected Consumer<ButtonInteractionEvent> action = null;
7272
protected List<ActionRow> actionRows = new ArrayList<>();
7373

7474
@Override
7575
public ButtonMenu build() {
7676

7777
if (eventWaiter == null) throw new IllegalStateException("The Event Waiter must be set!");
78-
if (actionRows.size() == 0) throw new IllegalStateException("There must be at least one action row");
78+
if (actionRows.isEmpty()) throw new IllegalStateException("There must be at least one action row");
7979
if (action == null) throw new IllegalStateException("There must be a callback action");
8080
if (initialMessage == null) throw new IllegalStateException("There must be an initial message");
8181

@@ -97,7 +97,7 @@ public ButtonMenu build() {
9797
* @param initialMessage Sets the initial message that should be sent with the components
9898
* @return Itself for chaining convenience
9999
*/
100-
public Builder setInitialMessage(Message initialMessage) {
100+
public Builder setInitialMessage(MessageCreateData initialMessage) {
101101
this.initialMessage = initialMessage;
102102
return this;
103103
}

‎menus/src/main/java/me/anutley/jdautils/menus/Menu.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import me.anutley.jdautils.eventwaiter.EventWaiter;
44
import net.dv8tion.jda.api.entities.Guild;
5-
import net.dv8tion.jda.api.entities.MessageChannel;
65
import net.dv8tion.jda.api.entities.Role;
76
import net.dv8tion.jda.api.entities.User;
7+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
88
import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
99
import org.jetbrains.annotations.Nullable;
1010

‎menus/src/main/java/me/anutley/jdautils/menus/ReactionMenu.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package me.anutley.jdautils.menus;
22

33
import me.anutley.jdautils.eventwaiter.EventWaiter;
4-
import net.dv8tion.jda.api.MessageBuilder;
5-
import net.dv8tion.jda.api.entities.Message;
6-
import net.dv8tion.jda.api.entities.MessageChannel;
4+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
75
import net.dv8tion.jda.api.entities.Role;
86
import net.dv8tion.jda.api.entities.User;
97
import net.dv8tion.jda.api.entities.emoji.Emoji;
108
import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
119
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
10+
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
11+
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
1212

1313
import java.util.ArrayList;
1414
import java.util.Arrays;
@@ -18,11 +18,11 @@
1818

1919
public class ReactionMenu extends Menu {
2020

21-
protected final Message initialMessage;
21+
protected final MessageCreateData initialMessage;
2222
protected final Consumer<MessageReactionAddEvent> action;
2323
protected final List<String> reactions;
2424

25-
public ReactionMenu(EventWaiter eventWaiter, List<User> allowedUsers, List<Role> allowedRoles, long timeout, TimeUnit units, boolean recursive, boolean ephemeral, Message initialMessage, Consumer<MessageReactionAddEvent> action, List<String> reactions) {
25+
public ReactionMenu(EventWaiter eventWaiter, List<User> allowedUsers, List<Role> allowedRoles, long timeout, TimeUnit units, boolean recursive, boolean ephemeral, MessageCreateData initialMessage, Consumer<MessageReactionAddEvent> action, List<String> reactions) {
2626
super(eventWaiter, allowedUsers, allowedRoles, timeout, units, recursive, ephemeral);
2727
this.initialMessage = initialMessage;
2828
this.action = action;
@@ -31,7 +31,7 @@ public ReactionMenu(EventWaiter eventWaiter, List<User> allowedUsers, List<Role>
3131

3232
@Override
3333
public void show(MessageChannel channel) {
34-
channel.sendMessage(new MessageBuilder(initialMessage).build()).queue(
34+
channel.sendMessage(MessageCreateBuilder.from(initialMessage).build()).queue(
3535
message -> {
3636
reactions.forEach(r -> message.addReaction(Emoji.fromUnicode(r)).queue());
3737
waitForClick(message.getIdLong());
@@ -42,7 +42,7 @@ public void show(MessageChannel channel) {
4242
@Override
4343
public void show(GenericCommandInteractionEvent event) {
4444
event.reply(
45-
new MessageBuilder((initialMessage))
45+
MessageCreateBuilder.from((initialMessage))
4646
.build()
4747
).setEphemeral(ephemeral).queue(
4848
success -> success.retrieveOriginal().queue(m -> {
@@ -69,7 +69,7 @@ private void waitForClick(long messageId) {
6969

7070
public static class Builder extends Menu.Builder<ReactionMenu.Builder, ReactionMenu> {
7171

72-
protected Message initialMessage = null;
72+
protected MessageCreateData initialMessage = null;
7373
protected Consumer<MessageReactionAddEvent> action = null;
7474
protected List<String> reactions = new ArrayList<>();
7575

@@ -99,7 +99,7 @@ public ReactionMenu build() {
9999
* @param initialMessage Sets the initial message that should be sent with the components
100100
* @return Itself for chaining convenience
101101
*/
102-
public Builder setInitialMessage(Message initialMessage) {
102+
public Builder setInitialMessage(MessageCreateData initialMessage) {
103103
this.initialMessage = initialMessage;
104104
return this;
105105
}

0 commit comments

Comments
 (0)