Skip to content

Commit f024f49

Browse files
DxsSucukDxsSucuk
committed
chore: Upgrade to JDA6
1 parent c4aad31 commit f024f49

File tree

17 files changed

+251
-122
lines changed

17 files changed

+251
-122
lines changed

‎pom.xml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>net.dv8tion</groupId>
5555
<artifactId>JDA</artifactId>
56-
<version>5.6.1</version>
56+
<version>6.0.0-rc.5</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>dev.arbjerg</groupId>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>dev.lavalink.youtube</groupId>
6565
<artifactId>v2</artifactId>
66-
<version>1.13.3</version>
66+
<version>1.13.5</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>com.sedmelluq</groupId>
@@ -305,6 +305,28 @@
305305
<build>
306306
<pluginManagement>
307307
<plugins>
308+
<plugin>
309+
<groupId>org.openrewrite.maven</groupId>
310+
<artifactId>rewrite-maven-plugin</artifactId>
311+
<version>6.13.0</version>
312+
<configuration>
313+
<activeRecipes>
314+
<recipe>net.dv8tion.MigrateComponentsV2</recipe>
315+
</activeRecipes>
316+
</configuration>
317+
<dependencies>
318+
<dependency>
319+
<groupId>org.openrewrite.recipe</groupId>
320+
<artifactId>rewrite-java-dependencies</artifactId>
321+
<version>1.37.0</version>
322+
</dependency>
323+
<dependency>
324+
<groupId>net.dv8tion</groupId>
325+
<artifactId>JDA</artifactId>
326+
<version>6.0.0-rc.1</version>
327+
</dependency>
328+
</dependencies>
329+
</plugin>
308330
<plugin>
309331
<artifactId>maven-javadoc-plugin</artifactId>
310332
<version>3.12.0</version>

‎src/main/java/de/presti/ree6/audio/AudioPlayerReceiveHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
import net.dv8tion.jda.api.Permission;
1313
import net.dv8tion.jda.api.audio.AudioReceiveHandler;
1414
import net.dv8tion.jda.api.audio.CombinedAudio;
15+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
16+
import net.dv8tion.jda.api.components.buttons.Button;
17+
import net.dv8tion.jda.api.components.buttons.ButtonStyle;
1518
import net.dv8tion.jda.api.entities.Member;
1619
import net.dv8tion.jda.api.entities.Message;
1720
import net.dv8tion.jda.api.entities.User;
1821
import net.dv8tion.jda.api.entities.channel.ChannelType;
1922
import net.dv8tion.jda.api.entities.channel.unions.AudioChannelUnion;
2023
import net.dv8tion.jda.api.entities.emoji.Emoji;
21-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
22-
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
2324
import net.dv8tion.jda.api.utils.FileUpload;
24-
import net.dv8tion.jda.internal.interactions.component.ButtonImpl;
2525
import org.jetbrains.annotations.NotNull;
2626

2727
import java.awt.*;
@@ -201,11 +201,11 @@ public void endReceiving() {
201201
.setFooter(BotConfig.getAdvertisement(), audioChannelUnion.getGuild().getIconUrl())
202202
.setTitle(LanguageService.getByGuild(audioChannelUnion.getGuild(), "label.recording.finished").block())
203203
.build())
204-
.setActionRow(
204+
.setComponents(ActionRow.of(
205205
Button.of(ButtonStyle.LINK, BotConfig.getRecordingUrl() + "?id=" + recording.getIdentifier(),
206206
LanguageService.getByGuild(audioChannelUnion.getGuild(), "label.download").block(), Emoji.fromCustom("shiba", 941219375535509504L, true)),
207207
Button.primary("r_recordingDownload:" + recording.getIdentifier(), Emoji.fromCustom("sip", 1011956355810209852L, false))
208-
.withLabel(LanguageService.getByGuild(audioChannelUnion.getGuild(), "label.sendToChat").block()).withDisabled(!BotConfig.allowRecordingInChat())).complete();
208+
.withLabel(LanguageService.getByGuild(audioChannelUnion.getGuild(), "label.sendToChat").block()).withDisabled(!BotConfig.allowRecordingInChat()))).complete();
209209
}
210210
});
211211
// Find a way to still notify that the bot couldn't send the audio.

‎src/main/java/de/presti/ree6/commands/CommandManager.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,6 @@ public void addSlashCommand(JDA jda) {
269269
commandData1.setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR));
270270
}
271271

272-
commandData1.setGuildOnly(true);
273-
274272
//noinspection ResultOfMethodCallIgnored
275273
listUpdateAction.addCommands(commandData1);
276274
} else {

‎src/main/java/de/presti/ree6/commands/impl/community/Ticket.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
import de.presti.ree6.sql.entities.Tickets;
1212
import net.dv8tion.jda.api.EmbedBuilder;
1313
import net.dv8tion.jda.api.Permission;
14+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
15+
import net.dv8tion.jda.api.components.buttons.Button;
16+
import net.dv8tion.jda.api.components.buttons.ButtonStyle;
1417
import net.dv8tion.jda.api.entities.channel.ChannelType;
1518
import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildMessageChannel;
1619
import net.dv8tion.jda.api.entities.emoji.Emoji;
1720
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
1821
import net.dv8tion.jda.api.interactions.commands.OptionType;
1922
import net.dv8tion.jda.api.interactions.commands.build.CommandData;
2023
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
21-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
22-
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
2324
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
2425
import net.dv8tion.jda.internal.interactions.CommandDataImpl;
2526

@@ -84,7 +85,7 @@ public void onPerform(CommandEvent commandEvent) {
8485
.setThumbnail(commandEvent.getGuild().getIconUrl())
8586
.setFooter(commandEvent.getGuild().getName() + " - " + BotConfig.getAdvertisement(), commandEvent.getGuild().getIconUrl())
8687
.build());
87-
messageCreateBuilder.setActionRow(Button.of(ButtonStyle.PRIMARY, "re_ticket_open", LanguageService.getByGuild(commandEvent.getGuild(), "label.openTicket").block(), Emoji.fromUnicode("U+1F4E9")));
88+
messageCreateBuilder.setComponents(ActionRow.of(Button.of(ButtonStyle.PRIMARY, "re_ticket_open", LanguageService.getByGuild(commandEvent.getGuild(), "label.openTicket").block(), Emoji.fromUnicode("U+1F4E9"))));
8889
Main.getInstance().getCommandManager().sendMessage(messageCreateBuilder.build(), ticketChannel.getAsChannel().asTextChannel());
8990
});
9091
});

‎src/main/java/de/presti/ree6/commands/impl/info/Credits.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import de.presti.ree6.commands.interfaces.Command;
66
import de.presti.ree6.commands.interfaces.ICommand;
77
import de.presti.ree6.utils.others.RandomUtils;
8+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
9+
import net.dv8tion.jda.api.components.buttons.Button;
810
import net.dv8tion.jda.api.interactions.commands.build.CommandData;
9-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
1011
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
1112

1213
/**
@@ -21,8 +22,8 @@ public class Credits implements ICommand {
2122
@Override
2223
public void onPerform(CommandEvent commandEvent) {
2324
MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
24-
messageCreateBuilder.addActionRow(Button.link("https://www.ree6.de/#team", (RandomUtils.secureRandom.nextInt(10000) == 1562 ?
25-
commandEvent.getResource("message.credits.easterEgg") : commandEvent.getResource("message.credits.default"))));
25+
messageCreateBuilder.setComponents(ActionRow.of(Button.link("https://www.ree6.de/#team", (RandomUtils.secureRandom.nextInt(10000) == 1562 ?
26+
commandEvent.getResource("message.credits.easterEgg") : commandEvent.getResource("message.credits.default")))));
2627
commandEvent.reply(messageCreateBuilder.build());
2728
}
2829

‎src/main/java/de/presti/ree6/commands/impl/info/Help.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
import de.presti.ree6.sql.SQLSession;
1010
import de.presti.ree6.utils.data.RegExUtil;
1111
import net.dv8tion.jda.api.EmbedBuilder;
12+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
13+
import net.dv8tion.jda.api.components.buttons.Button;
14+
import net.dv8tion.jda.api.components.buttons.ButtonStyle;
1215
import net.dv8tion.jda.api.entities.emoji.Emoji;
1316
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
1417
import net.dv8tion.jda.api.interactions.commands.OptionType;
1518
import net.dv8tion.jda.api.interactions.commands.build.CommandData;
1619
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
17-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
18-
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
1920
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
2021
import net.dv8tion.jda.internal.interactions.CommandDataImpl;
2122

@@ -66,7 +67,7 @@ public void sendHelpInformation(String categoryString, CommandEvent commandEvent
6667
em.setFooter(commandEvent.getGuild().getName() + " - " + BotConfig.getAdvertisement(), commandEvent.getGuild().getIconUrl());
6768

6869
messageCreateBuilder
69-
.addActionRow(
70+
.setComponents(ActionRow.of(
7071
Button.of(ButtonStyle.LINK, BotConfig.getInvite(), commandEvent.getResource("label.invite"),
7172
Emoji.fromCustom("re_icon_invite", 1019234807844175945L, false)),
7273
Button.of(ButtonStyle.LINK, BotConfig.getSupport(), commandEvent.getResource("label.support"),
@@ -75,7 +76,7 @@ public void sendHelpInformation(String categoryString, CommandEvent commandEvent
7576
Emoji.fromCustom("re_icon_github", 492259724079792138L, false)),
7677
Button.of(ButtonStyle.SECONDARY, "re_feedback", commandEvent.getResource("label.feedback"),
7778
Emoji.fromCustom("kiss", 1012765976951009361L, true))
78-
);
79+
));
7980

8081
if (categoryString == null) {
8182
SQLSession.getSqlConnector().getSqlWorker().getSetting(commandEvent.getGuild().getIdLong(), "chatprefix").subscribe(setting -> {

‎src/main/java/de/presti/ree6/commands/impl/info/Invite.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
import de.presti.ree6.commands.CommandEvent;
55
import de.presti.ree6.commands.interfaces.Command;
66
import de.presti.ree6.commands.interfaces.ICommand;
7+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
8+
import net.dv8tion.jda.api.components.buttons.Button;
9+
import net.dv8tion.jda.api.components.buttons.ButtonStyle;
710
import de.presti.ree6.bot.BotConfig;
811
import net.dv8tion.jda.api.entities.emoji.Emoji;
912
import net.dv8tion.jda.api.interactions.commands.build.CommandData;
10-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
11-
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
1213
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
1314

1415
/**
@@ -23,8 +24,8 @@ public class Invite implements ICommand {
2324
@Override
2425
public void onPerform(CommandEvent commandEvent) {
2526
MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
26-
messageCreateBuilder.addActionRow(Button.of(ButtonStyle.LINK, BotConfig.getInvite(), commandEvent.getResource("label.invite"),
27-
Emoji.fromCustom("re_icon_invite", 1019234807844175945L, false)));
27+
messageCreateBuilder.setComponents(ActionRow.of(Button.of(ButtonStyle.LINK, BotConfig.getInvite(), commandEvent.getResource("label.invite"),
28+
Emoji.fromCustom("re_icon_invite", 1019234807844175945L, false))));
2829
commandEvent.reply(messageCreateBuilder.build());
2930
}
3031

‎src/main/java/de/presti/ree6/commands/impl/info/Support.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
import de.presti.ree6.commands.CommandEvent;
55
import de.presti.ree6.commands.interfaces.Command;
66
import de.presti.ree6.commands.interfaces.ICommand;
7+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
8+
import net.dv8tion.jda.api.components.buttons.Button;
9+
import net.dv8tion.jda.api.components.buttons.ButtonStyle;
710
import de.presti.ree6.bot.BotConfig;
811
import net.dv8tion.jda.api.entities.emoji.Emoji;
912
import net.dv8tion.jda.api.interactions.commands.build.CommandData;
10-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
11-
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
1213
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
1314

1415
/**
@@ -23,8 +24,8 @@ public class Support implements ICommand {
2324
@Override
2425
public void onPerform(CommandEvent commandEvent) {
2526
MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
26-
messageCreateBuilder.addActionRow(Button.of(ButtonStyle.LINK, BotConfig.getSupport(), commandEvent.getResource("label.support"),
27-
Emoji.fromCustom("re_icon_help", 1019234684745564170L, false)));
27+
messageCreateBuilder.setComponents(ActionRow.of(Button.of(ButtonStyle.LINK, BotConfig.getSupport(), commandEvent.getResource("label.support"),
28+
Emoji.fromCustom("re_icon_help", 1019234684745564170L, false))));
2829
commandEvent.reply(messageCreateBuilder.build());
2930
}
3031

‎src/main/java/de/presti/ree6/commands/impl/level/Leaderboards.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import de.presti.ree6.commands.CommandEvent;
55
import de.presti.ree6.commands.interfaces.Command;
66
import de.presti.ree6.commands.interfaces.ICommand;
7+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
8+
import net.dv8tion.jda.api.components.buttons.Button;
79
import de.presti.ree6.bot.BotConfig;
810
import net.dv8tion.jda.api.interactions.commands.build.CommandData;
9-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
1011
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
1112

1213
/**
@@ -22,11 +23,11 @@ public class Leaderboards implements ICommand {
2223
public void onPerform(CommandEvent commandEvent) {
2324
MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
2425
messageCreateBuilder.setContent(commandEvent.getResource("message.leaderboards"));
25-
messageCreateBuilder.addActionRow(
26+
messageCreateBuilder.setComponents(ActionRow.of(
2627
Button.link("https://support-dev.discord.com/hc/de/articles/360043053492-Statistics-Bot-Policy", commandEvent.getResource("label.discordGuidelines")),
2728
Button.link(BotConfig.getWebinterface() + "/dash/" + commandEvent.getGuild().getId() + "/leaderboards", commandEvent.getResource("label.chatLeaderboard")),
2829
Button.link(BotConfig.getWebinterface() + "/dash/" + commandEvent.getGuild().getId() + "/leaderboards", commandEvent.getResource("label.voiceLeaderboard"))
29-
);
30+
));
3031
commandEvent.reply(messageCreateBuilder.build());
3132
}
3233

‎src/main/java/de/presti/ree6/commands/impl/mod/Setup.java‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
import de.presti.ree6.utils.others.GuildUtil;
1515
import net.dv8tion.jda.api.EmbedBuilder;
1616
import net.dv8tion.jda.api.Permission;
17+
import net.dv8tion.jda.api.components.actionrow.ActionRow;
18+
import net.dv8tion.jda.api.components.buttons.Button;
19+
import net.dv8tion.jda.api.components.selections.SelectMenu;
20+
import net.dv8tion.jda.api.components.selections.SelectOption;
21+
import net.dv8tion.jda.api.components.selections.StringSelectMenu;
1722
import net.dv8tion.jda.api.entities.Guild;
1823
import net.dv8tion.jda.api.entities.Message;
1924
import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -27,11 +32,8 @@
2732
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
2833
import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
2934
import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
30-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
31-
import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
32-
import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
35+
import net.dv8tion.jda.internal.components.selections.StringSelectMenuImpl;
3336
import net.dv8tion.jda.internal.interactions.CommandDataImpl;
34-
import net.dv8tion.jda.internal.interactions.component.StringSelectMenuImpl;
3537
import reactor.core.publisher.Mono;
3638

3739
import java.awt.*;
@@ -104,14 +106,19 @@ public void onPerform(CommandEvent commandEvent) {
104106
optionList.add(SelectOption.of(commandEvent.getResource("label.ticketSystem"), "tickets"));
105107
optionList.add(SelectOption.of(commandEvent.getResource("label.rewards"), "rewards"));
106108

107-
SelectMenu selectMenu = new StringSelectMenuImpl("setupActionMenu", commandEvent.getResource("message.setup.setupMenuPlaceholder"), 1, 1, false, optionList);
109+
StringSelectMenu selectMenu = StringSelectMenu.create("setupActionMenu")
110+
.addOptions(optionList)
111+
.setPlaceholder(commandEvent.getResource("message.setup.setupMenuPlaceholder"))
112+
.setMinValues(1)
113+
.setMaxValues(1)
114+
.build();
108115

109116
if (commandEvent.isSlashCommand()) {
110117
commandEvent.getInteractionHook().sendMessageEmbeds(embedBuilder.build())
111-
.addActionRow(selectMenu).queue();
118+
.setComponents(ActionRow.of(selectMenu)).queue();
112119
} else {
113120
commandEvent.getChannel().sendMessageEmbeds(embedBuilder.build())
114-
.addActionRow(selectMenu).queue();
121+
.setComponents(ActionRow.of(selectMenu)).queue();
115122
}
116123
} else if (commandEvent.getSubcommand().equalsIgnoreCase("autorole")) {
117124
createAutoRoleSetupSelectMenu(commandEvent.getGuild(), commandEvent.getInteractionHook()).subscribe(menu -> {
@@ -120,12 +127,10 @@ public void onPerform(CommandEvent commandEvent) {
120127

121128
if (commandEvent.isSlashCommand()) {
122129
commandEvent.getInteractionHook().sendMessageEmbeds(embed)
123-
.addActionRow(menu)
124-
.addActionRow(webinterface).queue();
130+
.setComponents(ActionRow.of(menu), ActionRow.of(webinterface)).queue();
125131
} else {
126132
commandEvent.getChannel().sendMessageEmbeds(embed)
127-
.addActionRow(menu)
128-
.addActionRow(webinterface).queue();
133+
.setComponents(ActionRow.of(menu), ActionRow.of(webinterface)).queue();
129134
}
130135
});
131136
}
@@ -293,9 +298,14 @@ public static Mono<SelectMenu> createAutoRoleSetupSelectMenu(Guild guild, Intera
293298
}
294299
});
295300

296-
return new StringSelectMenuImpl("setupAutoRole", LanguageService.getByGuildOrInteractionHook(guild, interactionHook,
297-
"message.autoRole.setupPlaceholder").block(),
298-
0, Math.min(10, Math.max(1, optionList.size())), optionList.isEmpty(), optionList);
301+
return StringSelectMenu.create("setupAutoRole")
302+
.addOptions(optionList)
303+
.setPlaceholder(LanguageService.getByGuildOrInteractionHook(guild, interactionHook,
304+
"message.autoRole.setupPlaceholder").block())
305+
.setMinValues(0)
306+
.setMaxValues(Math.min(10, Math.max(1, optionList.size())))
307+
.setDisabled(optionList.isEmpty())
308+
.build();
299309
});
300310
}
301311

0 commit comments

Comments
 (0)