Skip to content

Commit 69941a9

Browse files
rainbowdashlabsrainbowdashlabs
committed
Migrate to latest jda version
1 parent 8374b19 commit 69941a9

14 files changed

Lines changed: 77 additions & 67 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spotless {
2626

2727
dependencies {
2828
//discord
29-
implementation("de.chojo", "cjda-util", "2.11.0+jda-5.6.1-SNAPSHOT") {
29+
implementation("de.chojo", "cjda-util", "2.11.0+jda-6.0.0-rc.3") {
3030
exclude(group = "club.minnced", module = "opus-java")
3131
}
3232

‎src/main/java/de/chojo/repbot/commands/bot/handler/SharedGuilds.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import de.chojo.repbot.util.Guilds;
1616
import net.dv8tion.jda.api.EmbedBuilder;
1717
import net.dv8tion.jda.api.Permission;
18+
import net.dv8tion.jda.api.components.buttons.Button;
1819
import net.dv8tion.jda.api.entities.Guild;
1920
import net.dv8tion.jda.api.entities.Member;
2021
import net.dv8tion.jda.api.entities.MessageEmbed;
2122
import net.dv8tion.jda.api.entities.User;
2223
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
2324
import net.dv8tion.jda.api.exceptions.ErrorResponseException;
2425
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
25-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
2626

2727
import java.util.ArrayList;
2828
import java.util.EnumSet;

‎src/main/java/de/chojo/repbot/commands/log/handler/Donated.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
1919
import net.dv8tion.jda.api.utils.messages.MessageEditData;
2020

21+
import java.util.Collection;
2122
import java.util.Collections;
2223
import java.util.List;
2324
import java.util.concurrent.CompletableFuture;
@@ -68,7 +69,11 @@ public int pages() {
6869
@Override
6970
public List<PageButton> buttons() {
7071
if (premium) {
71-
return Premium.buildEntitlementButtons(configuration.skus().features().reputationLog().extendedPages()).stream().map(PageButton::of).toList();
72+
return Premium.buildEntitlementButtons(configuration.skus().features().reputationLog().extendedPages())
73+
.stream()
74+
.map(p -> p.getButtons().stream().map(PageButton::of).toList())
75+
.flatMap(Collection::stream)
76+
.toList();
7277
}
7378
return super.buttons();
7479
}

‎src/main/java/de/chojo/repbot/commands/log/handler/Received.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
1919
import net.dv8tion.jda.api.utils.messages.MessageEditData;
2020

21+
import java.util.Collection;
2122
import java.util.Collections;
2223
import java.util.List;
2324
import java.util.concurrent.CompletableFuture;
@@ -68,7 +69,11 @@ public int pages() {
6869
@Override
6970
public List<PageButton> buttons() {
7071
if (premium) {
71-
return Premium.buildEntitlementButtons(configuration.skus().features().reputationLog().extendedPages()).stream().map(PageButton::of).toList();
72+
return Premium.buildEntitlementButtons(configuration.skus().features().reputationLog().extendedPages())
73+
.stream()
74+
.map(b -> b.getButtons().stream().map(PageButton::of).toList())
75+
.flatMap(Collection::stream)
76+
.toList();
7277
}
7378
return super.buttons();
7479
}

‎src/main/java/de/chojo/repbot/commands/messages/handler/States.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import de.chojo.jdautil.wrapper.EventContext;
1414
import de.chojo.repbot.dao.access.guild.settings.Settings;
1515
import de.chojo.repbot.dao.provider.GuildRepository;
16+
import net.dv8tion.jda.api.components.selections.StringSelectMenu;
1617
import net.dv8tion.jda.api.entities.MessageEmbed;
1718
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1819
import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
19-
import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
2020

2121
import java.awt.Color;
2222
import java.util.Collections;
@@ -33,10 +33,10 @@ public States(GuildRepository guildRepository) {
3333
public void onSlashCommand(SlashCommandInteractionEvent event, EventContext context) {
3434
var settings = guildRepository.guild(event.getGuild()).settings();
3535
var setting = StringSelectMenu.create("setting")
36-
.setPlaceholder("command.messages.states.message.choose")
37-
.setRequiredRange(1, 1)
38-
.addOption("command.messages.states.message.option.reactionconfirmation.name", "reaction_confirmation", "command.messages.states.message.option.reactionConfirmation.description")
39-
.build();
36+
.setPlaceholder("command.messages.states.message.choose")
37+
.setRequiredRange(1, 1)
38+
.addOption("command.messages.states.message.option.reactionconfirmation.name", "reaction_confirmation", "command.messages.states.message.option.reactionConfirmation.description")
39+
.build();
4040
var reactions = getMenu("reaction_confirmation",
4141
"command.messages.states.message.option.reactionconfirmation.name",
4242
"command.messages.states.message.choice.reactionConfirmation.true",

‎src/main/java/de/chojo/repbot/commands/repsettings/handler/Info.java‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import de.chojo.repbot.dao.access.guild.settings.Settings;
1515
import de.chojo.repbot.dao.access.guild.settings.sub.ReputationMode;
1616
import de.chojo.repbot.dao.provider.GuildRepository;
17+
import net.dv8tion.jda.api.components.selections.StringSelectMenu;
1718
import net.dv8tion.jda.api.entities.MessageEmbed;
1819
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1920
import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
20-
import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
2121

22-
import java.awt.Color;
22+
import java.awt.*;
2323
import java.util.Collections;
2424
import java.util.function.Consumer;
2525

@@ -34,17 +34,17 @@ public Info(GuildRepository guildRepository) {
3434
public void onSlashCommand(SlashCommandInteractionEvent event, EventContext context) {
3535
var guildSettings = guildRepository.guild(event.getGuild()).settings();
3636
var settings = StringSelectMenu.create("settings")
37-
.setPlaceholder("command.repsettings.info.message.choose")
38-
.setRequiredRange(1, 1)
39-
.addOption("command.repsettings.info.message.option.byreaction.name", "reactions", "command.repsettings.info.message.option.byreaction.description")
40-
.addOption("command.repsettings.info.message.option.byanswer.name", "answers", "command.repsettings.info.message.option.byanswer.description")
41-
.addOption("command.repsettings.info.message.option.bymention.name", "mention", "command.repsettings.info.message.option.bymention.description")
42-
.addOption("command.repsettings.info.message.option.byfuzzy.name", "fuzzy", "command.repsettings.info.message.option.byfuzzy.description")
43-
.addOption("command.repsettings.info.message.option.byembed.name", "embed", "command.repsettings.info.message.option.byembed.description")
44-
.addOption("command.repsettings.info.message.option.emojidebug.name", "emojidebug", "command.repsettings.info.message.option.emojidebug.description")
45-
.addOption("command.repsettings.info.message.option.skipsingletarget.name", "directembed", "command.repsettings.info.message.option.skipsingletarget.description")
46-
.addOption("command.repsettings.info.message.option.reputationmode.name", "reputationmode", "command.repsettings.info.message.option.reputationmode.description")
47-
.build();
37+
.setPlaceholder("command.repsettings.info.message.choose")
38+
.setRequiredRange(1, 1)
39+
.addOption("command.repsettings.info.message.option.byreaction.name", "reactions", "command.repsettings.info.message.option.byreaction.description")
40+
.addOption("command.repsettings.info.message.option.byanswer.name", "answers", "command.repsettings.info.message.option.byanswer.description")
41+
.addOption("command.repsettings.info.message.option.bymention.name", "mention", "command.repsettings.info.message.option.bymention.description")
42+
.addOption("command.repsettings.info.message.option.byfuzzy.name", "fuzzy", "command.repsettings.info.message.option.byfuzzy.description")
43+
.addOption("command.repsettings.info.message.option.byembed.name", "embed", "command.repsettings.info.message.option.byembed.description")
44+
.addOption("command.repsettings.info.message.option.emojidebug.name", "emojidebug", "command.repsettings.info.message.option.emojidebug.description")
45+
.addOption("command.repsettings.info.message.option.skipsingletarget.name", "directembed", "command.repsettings.info.message.option.skipsingletarget.description")
46+
.addOption("command.repsettings.info.message.option.reputationmode.name", "reputationmode", "command.repsettings.info.message.option.reputationmode.description")
47+
.build();
4848
var reactions = getMenu("reactions",
4949
"command.repsettings.info.message.option.byreaction.description",
5050
"command.repsettings.info.message.reactions.true",
@@ -76,15 +76,15 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
7676
"command.repsettings.info.message.skipsingleembed.false",
7777
guildSettings.reputation().isDirectActive());
7878
var reputationMode = StringSelectMenu.create("reputationmode")
79-
.setPlaceholder("command.repsettings.info.message.option.reputationmode.description")
80-
.setRequiredRange(1, 1)
81-
.addOption(ReputationMode.TOTAL.localeCode(), ReputationMode.TOTAL.name(), "command.repsettings.info.message.reputationMode.total")
82-
.addOption(ReputationMode.ROLLING_MONTH.localeCode(), ReputationMode.ROLLING_MONTH.name(), "command.repsettings.info.message.reputationMode.rollingMonth")
83-
.addOption(ReputationMode.ROLLING_WEEK.localeCode(), ReputationMode.ROLLING_WEEK.name(), "command.repsettings.info.message.reputationMode.rollingWeek")
84-
.addOption(ReputationMode.WEEK.localeCode(), ReputationMode.WEEK.name(), "command.repsettings.info.message.reputationMode.week")
85-
.addOption(ReputationMode.MONTH.localeCode(), ReputationMode.MONTH.name(), "command.repsettings.info.message.reputationMode.month")
86-
.setDefaultValues(Collections.singletonList(guildSettings.general().reputationMode().name()))
87-
.build();
79+
.setPlaceholder("command.repsettings.info.message.option.reputationmode.description")
80+
.setRequiredRange(1, 1)
81+
.addOption(ReputationMode.TOTAL.localeCode(), ReputationMode.TOTAL.name(), "command.repsettings.info.message.reputationMode.total")
82+
.addOption(ReputationMode.ROLLING_MONTH.localeCode(), ReputationMode.ROLLING_MONTH.name(), "command.repsettings.info.message.reputationMode.rollingMonth")
83+
.addOption(ReputationMode.ROLLING_WEEK.localeCode(), ReputationMode.ROLLING_WEEK.name(), "command.repsettings.info.message.reputationMode.rollingWeek")
84+
.addOption(ReputationMode.WEEK.localeCode(), ReputationMode.WEEK.name(), "command.repsettings.info.message.reputationMode.week")
85+
.addOption(ReputationMode.MONTH.localeCode(), ReputationMode.MONTH.name(), "command.repsettings.info.message.reputationMode.month")
86+
.setDefaultValues(Collections.singletonList(guildSettings.general().reputationMode().name()))
87+
.build();
8888

8989
context.registerMenu(MenuAction.forCallback(getSettings(context, guildSettings), event)
9090
.addComponent(MenuEntry.of(settings, ctx -> {
@@ -100,22 +100,22 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
100100
}))
101101
.addComponent(MenuEntry.of(reactions, ctx -> refresh(ctx, res -> guildSettings.reputation()
102102
.reactionActive(res), context, guildSettings))
103-
.hidden())
103+
.hidden())
104104
.addComponent(MenuEntry.of(answers, ctx -> refresh(ctx, res -> guildSettings.reputation()
105105
.answerActive(res), context, guildSettings))
106-
.hidden())
106+
.hidden())
107107
.addComponent(MenuEntry.of(mention, ctx -> refresh(ctx, res -> guildSettings.reputation()
108108
.mentionActive(res), context, guildSettings))
109-
.hidden())
109+
.hidden())
110110
.addComponent(MenuEntry.of(fuzzy, ctx -> refresh(ctx, res -> guildSettings.reputation()
111111
.fuzzyActive(res), context, guildSettings))
112-
.hidden())
112+
.hidden())
113113
.addComponent(MenuEntry.of(embed, ctx -> refresh(ctx, res -> guildSettings.reputation()
114114
.embedActive(res), context, guildSettings))
115-
.hidden())
115+
.hidden())
116116
.addComponent(MenuEntry.of(skipSingleEmbed, ctx -> refresh(ctx, res -> guildSettings.reputation()
117117
.directActive(res), context, guildSettings))
118-
.hidden())
118+
.hidden())
119119
.addComponent(MenuEntry.of(reputationMode, ctx -> {
120120
var value = ctx.event().getValues().get(0);
121121
var copy = ctx.entry().component().createCopy();
@@ -132,12 +132,12 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
132132

133133
private StringSelectMenu getMenu(String id, String placeholder, String enabledDescr, String disabledDescr, boolean state) {
134134
return StringSelectMenu.create(id)
135-
.setPlaceholder(placeholder)
136-
.setRequiredRange(1, 1)
137-
.addOption("words.enabled", "enabled", enabledDescr)
138-
.addOption("words.disabled", "disabled", disabledDescr)
139-
.setDefaultValues(Collections.singleton(state ? "enabled" : "disabled"))
140-
.build();
135+
.setPlaceholder(placeholder)
136+
.setRequiredRange(1, 1)
137+
.addOption("words.enabled", "enabled", enabledDescr)
138+
.addOption("words.disabled", "disabled", disabledDescr)
139+
.setDefaultValues(Collections.singleton(state ? "enabled" : "disabled"))
140+
.build();
141141
}
142142

143143
private void refresh(EntryContext<StringSelectInteractionEvent, StringSelectMenu> ctx, Consumer<Boolean> result, EventContext

‎src/main/java/de/chojo/repbot/commands/roles/handler/BaseRoleModifier.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import de.chojo.jdautil.menus.entries.ButtonEntry;
1111
import de.chojo.jdautil.wrapper.EventContext;
1212
import de.chojo.repbot.dao.provider.GuildRepository;
13+
import net.dv8tion.jda.api.components.buttons.Button;
14+
import net.dv8tion.jda.api.components.buttons.ButtonStyle;
1315
import net.dv8tion.jda.api.entities.MessageEmbed;
1416
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
15-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
16-
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
1717

1818
import java.util.function.Consumer;
1919

‎src/main/java/de/chojo/repbot/commands/setup/handler/Start.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import de.chojo.repbot.serialization.ThankwordsContainer;
2727
import de.chojo.repbot.util.PermissionErrorHandler;
2828
import net.dv8tion.jda.api.Permission;
29+
import net.dv8tion.jda.api.components.buttons.Button;
30+
import net.dv8tion.jda.api.components.buttons.ButtonStyle;
2931
import net.dv8tion.jda.api.entities.Role;
3032
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
3133
import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildChannel;
3234
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
33-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
34-
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
3535
import org.apache.commons.lang3.StringUtils;
3636
import org.jetbrains.annotations.NotNull;
3737

‎src/main/java/de/chojo/repbot/commands/supporter/handler/Info.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import de.chojo.repbot.dao.provider.GuildRepository;
1414
import de.chojo.repbot.service.PremiumService;
1515
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
16-
import net.dv8tion.jda.api.interactions.components.ActionRow;
17-
import net.dv8tion.jda.api.interactions.components.buttons.Button;
1816

1917
import java.util.Collection;
2018
import java.util.List;
@@ -64,8 +62,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
6462
}
6563

6664
var buttons = configuration.skus().subscriptions().stream().map(e -> List.of(e.subscriptionSkuMeta(), e.lifetimeSkuMeta()))
67-
.map(e -> e.stream().map(Premium::buildEntitlementButtons).flatMap(Collection::stream).toArray(Button[]::new))
68-
.map(ActionRow::of)
65+
.map(e -> e.stream().map(Premium::buildEntitlementButtons).flatMap(Collection::stream).toList())
66+
.flatMap(Collection::stream)
6967
.toList();
7068

7169
event.getHook().editOriginal(context.localize(content))

0 commit comments

Comments
 (0)