Skip to content

Commit cef4187

Browse files
danthe1stdanthe1st
committed
update to JDA 6.1.0
1 parent 37f5775 commit cef4187

File tree

72 files changed

+316
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+316
-243
lines changed

‎build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ dependencies {
3232
compileOnly("org.jetbrains:annotations:26.0.2")
3333

3434
// DIH4JDA (Command Framework) & JDA
35-
implementation("com.github.DynxstyGIT:DIH4JDA:a64b5a9dc5")
36-
implementation("net.dv8tion:JDA:5.6.1") {
35+
implementation("com.github.jasonlessenich:DIH4JDA:1.7.0")
36+
//implementation("xyz.dynxsty:dih4jda:1.7.0")
37+
implementation("net.dv8tion:JDA:6.1.0") {
3738
exclude(module = "opus-java")
3839
}
3940

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎src/main/java/net/discordjug/javabot/data/h2db/commands/DbAdminCommand.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;
55
import net.discordjug.javabot.data.config.BotConfig;
66
import net.dv8tion.jda.api.Permission;
7+
import net.dv8tion.jda.api.interactions.InteractionContextType;
78
import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
89
import net.dv8tion.jda.api.interactions.commands.build.Commands;
910
import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
@@ -27,7 +28,7 @@ public DbAdminCommand(BotConfig botConfig, ExportSchemaSubcommand exportSchemaSu
2728
setRegistrationType(RegistrationType.GUILD);
2829
setCommandData(Commands.slash("db-admin", "(ADMIN ONLY) Administrative Commands for managing the bot's database.")
2930
.setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.MANAGE_SERVER))
30-
.setGuildOnly(true)
31+
.setContexts(InteractionContextType.GUILD)
3132
);
3233
addSubcommands(exportSchemaSubcommand, exportTableSubcommand, migrationsListSubcommand, migrateSubcommand, quickMigrateSubcommand);
3334
addSubcommandGroups(SubcommandGroup.of(

‎src/main/java/net/discordjug/javabot/data/h2db/commands/QuickMigrateSubcommand.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package net.discordjug.javabot.data.h2db.commands;
22

3+
import net.dv8tion.jda.api.modals.Modal;
34
import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;
45
import xyz.dynxsty.dih4jda.interactions.components.ModalHandler;
56
import net.discordjug.javabot.annotations.AutoDetectableComponentHandler;
67
import net.discordjug.javabot.data.config.SystemsConfig;
78
import net.discordjug.javabot.util.ExceptionLogger;
89
import net.discordjug.javabot.util.Responses;
910
import net.dv8tion.jda.api.Permission;
11+
import net.dv8tion.jda.api.components.label.Label;
12+
import net.dv8tion.jda.api.components.textinput.TextInput;
13+
import net.dv8tion.jda.api.components.textinput.TextInputStyle;
1014
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
1115
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
1216
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1317
import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
14-
import net.dv8tion.jda.api.interactions.components.ActionRow;
15-
import net.dv8tion.jda.api.interactions.modals.Modal;
16-
import net.dv8tion.jda.api.interactions.components.text.TextInput;
17-
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
1818
import net.dv8tion.jda.api.interactions.modals.ModalMapping;
1919

2020
import org.jetbrains.annotations.NotNull;
@@ -105,7 +105,7 @@ public void handleModal(@NotNull ModalInteractionEvent event, List<ModalMapping>
105105
}
106106

107107
private @NotNull Modal buildQuickMigrateModal() {
108-
TextInput sqlInput = TextInput.create("sql", "SQL-Statement (H2)", TextInputStyle.PARAGRAPH)
108+
TextInput sqlInput = TextInput.create("sql", TextInputStyle.PARAGRAPH)
109109
.setPlaceholder("""
110110
CREATE TABLE my_table (
111111
thread_id BIGINT PRIMARY KEY,
@@ -114,12 +114,12 @@ CREATE TABLE my_table (
114114
""")
115115
.setRequired(true)
116116
.build();
117-
TextInput confirmInput = TextInput.create("confirmation", "Confirmation", TextInputStyle.SHORT)
117+
TextInput confirmInput = TextInput.create("confirmation", TextInputStyle.SHORT)
118118
.setPlaceholder("Type 'CONFIRM' to confirm this action")
119119
.setRequired(true)
120120
.build();
121121
return Modal.create("quick-migrate", "Quick Migrate")
122-
.addComponents(ActionRow.of(sqlInput), ActionRow.of(confirmInput))
122+
.addComponents(Label.of("SQL-Statement (H2)", sqlInput), Label.of("Confirmation", confirmInput))
123123
.build();
124124
}
125125
}

‎src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
import net.discordjug.javabot.util.TimeUtils;
1313
import net.discordjug.javabot.util.UserUtils;
1414
import net.dv8tion.jda.api.EmbedBuilder;
15+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
16+
import net.dv8tion.jda.api.components.buttons.Button;
1517
import net.dv8tion.jda.api.entities.*;
1618
import net.dv8tion.jda.api.entities.Message.Attachment;
1719
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
18-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
1920
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
2021
import net.dv8tion.jda.api.utils.FileUpload;
2122

@@ -120,7 +121,7 @@ public void sendUpdatedMessageToLog(Message updated, CachedMessage before) {
120121
if (updated.getContentRaw().trim().equals(before.getMessageContent()) && updated.getAttachments().size() == before.getAttachments().size()) return;
121122
MessageCreateAction action = config.getMessageCacheLogChannel()
122123
.sendMessageEmbeds(buildMessageEditEmbed(updated.getGuild(), updated.getAuthor(), updated.getChannel(), before, updated))
123-
.setActionRow(Button.link(updated.getJumpUrl(), "Jump to Message"));
124+
.addComponents(ActionRow.of(Button.link(updated.getJumpUrl(), "Jump to Message")));
124125
if (before.getMessageContent().length() > MessageEmbed.VALUE_MAX_LENGTH || updated.getContentRaw().length() > MessageEmbed.VALUE_MAX_LENGTH) {
125126
action.addFiles(FileUpload.fromData(buildEditedMessageFile(updated.getAuthor(), before, updated), before.getMessageId() + ".txt"));
126127
}

‎src/main/java/net/discordjug/javabot/listener/GitHubLinkListener.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import net.discordjug.javabot.util.ExceptionLogger;
55
import net.discordjug.javabot.util.InteractionUtils;
66
import net.discordjug.javabot.util.StringUtils;
7+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
8+
import net.dv8tion.jda.api.components.buttons.Button;
79
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
810
import net.dv8tion.jda.api.hooks.ListenerAdapter;
9-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
1011

1112
import org.jetbrains.annotations.Contract;
1213
import org.jetbrains.annotations.NotNull;
@@ -37,7 +38,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
3738
if (!content.getFirst().isBlank() && !content.getSecond().isBlank()) {
3839
event.getMessage().reply(String.format("```%s\n%s\n```", content.getSecond(), StringUtils.standardSanitizer().compute(content.getFirst())))
3940
.setAllowedMentions(List.of())
40-
.setActionRow(InteractionUtils.createDeleteButton(event.getAuthor().getIdLong()), Button.link(matcher.group(), "View on GitHub"))
41+
.addComponents(ActionRow.of(InteractionUtils.createDeleteButton(event.getAuthor().getIdLong()), Button.link(matcher.group(), "View on GitHub")))
4142
.queue();
4243
}
4344
}
@@ -56,7 +57,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
5657
String[] segments = Arrays.copyOfRange(arr, 3, arr.length);
5758
// The file name, split by "."
5859
String[] file = segments[segments.length - 1].split("\\.");
59-
Integer[] lines = Arrays.stream(file[1].split("L"))
60+
Integer[] lines = Arrays.stream(file[file.length-1].split("L"))
6061
.map(line -> line.replace("-", ""))
6162
.filter(line -> line.matches("-?\\d+")) // check if the given link is a number
6263
.map(Integer::valueOf).sorted().toArray(Integer[]::new);

‎src/main/java/net/discordjug/javabot/listener/JobChannelCloseOldPostsListener.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.discordjug.javabot.data.config.guild.ModerationConfig;
1010
import net.discordjug.javabot.util.InteractionUtils;
1111
import net.dv8tion.jda.api.EmbedBuilder;
12+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
1213
import net.dv8tion.jda.api.entities.UserSnowflake;
1314
import net.dv8tion.jda.api.entities.channel.ChannelType;
1415
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
@@ -78,7 +79,7 @@ public void onChannelCreate(ChannelCreateEvent event) {
7879
.setDescription("Since only one open post is allowed per user, older posts have been closed")
7980
.setColor(Color.YELLOW)
8081
.build())
81-
.addActionRow(InteractionUtils.createDeleteButton(post.getOwnerIdLong()))
82+
.addComponents(ActionRow.of(InteractionUtils.createDeleteButton(post.getOwnerIdLong())))
8283
.queue();
8384
}
8485
}

‎src/main/java/net/discordjug/javabot/listener/QOTWSubmissionListener.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.discordjug.javabot.data.config.BotConfig;
55
import net.discordjug.javabot.data.config.guild.QOTWConfig;
66
import net.discordjug.javabot.util.InteractionUtils;
7+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
78
import net.dv8tion.jda.api.entities.channel.ChannelType;
89
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
910
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@@ -35,7 +36,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
3536
Please keep in mind that messages **over 2000 characters** get split in half due to webhook limitations.
3637
If you want to make sure that your submission is properly formatted, split your message into smaller chunks instead.""",
3738
event.getAuthor().getAsMention())
38-
.setActionRow(InteractionUtils.createDeleteButton(event.getAuthor().getIdLong()))
39+
.addComponents(ActionRow.of(InteractionUtils.createDeleteButton(event.getAuthor().getIdLong())))
3940
.queue();
4041
}
4142
}

‎src/main/java/net/discordjug/javabot/systems/configuration/SetConfigSubcommand.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
import net.discordjug.javabot.data.config.GuildConfig;
66
import net.discordjug.javabot.data.config.UnknownPropertyException;
77
import net.discordjug.javabot.util.Responses;
8+
import net.dv8tion.jda.api.components.label.Label;
9+
import net.dv8tion.jda.api.components.textinput.TextInput;
10+
import net.dv8tion.jda.api.components.textinput.TextInputStyle;
811
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
912
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
1013
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1114
import net.dv8tion.jda.api.interactions.AutoCompleteQuery;
1215
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
1316
import net.dv8tion.jda.api.interactions.commands.OptionType;
1417
import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
15-
import net.dv8tion.jda.api.interactions.components.text.TextInput;
16-
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
17-
import net.dv8tion.jda.api.interactions.modals.Modal;
1818
import net.dv8tion.jda.api.interactions.modals.ModalMapping;
19+
import net.dv8tion.jda.api.modals.Modal;
1920
import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
2021
import xyz.dynxsty.dih4jda.interactions.AutoCompletable;
2122
import xyz.dynxsty.dih4jda.interactions.components.ModalHandler;
@@ -58,9 +59,9 @@ public InteractionCallbackAction<?> handleConfigSubcommand(@Nonnull SlashCommand
5859
}
5960
return event.replyModal(
6061
Modal.create(ComponentIdBuilder.build("config-set", property), "Change configuration value")
61-
.addActionRow(TextInput.create("value", "new value", TextInputStyle.PARAGRAPH)
62+
.addComponents(Label.of("new value", TextInput.create("value", TextInputStyle.PARAGRAPH)
6263
.setValue(String.valueOf(resolved))
63-
.build())
64+
.build()))
6465
.build());
6566
}
6667
String valueString = valueOption.getAsString().trim();

‎src/main/java/net/discordjug/javabot/systems/custom_vc/CustomVCButtonHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import net.discordjug.javabot.annotations.AutoDetectableComponentHandler;
77
import net.discordjug.javabot.util.Responses;
88
import net.dv8tion.jda.api.Permission;
9+
import net.dv8tion.jda.api.components.buttons.Button;
910
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
10-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
1111
import net.dv8tion.jda.api.requests.restaction.PermissionOverrideAction;
1212
import xyz.dynxsty.dih4jda.interactions.components.ButtonHandler;
1313
import xyz.dynxsty.dih4jda.util.ComponentIdBuilder;
@@ -40,7 +40,7 @@ public void handleButton(ButtonInteractionEvent event, Button button) {
4040
Responses.error(event, "Only the VC owner can use this.").queue();
4141
return;
4242
}
43-
String[] id = ComponentIdBuilder.split(button.getId());
43+
String[] id = ComponentIdBuilder.split(button.getCustomId());
4444
switch (id[1]) {
4545
case MAKE_PRIVATE_ID -> changeVisibility(event, createMakePublicButton(), "This voice channel is now private.",
4646
PermissionOverrideAction::setDenied);

0 commit comments

Comments
 (0)