Skip to content

Commit b65a47f

Browse files
MatyrobbrtMatyrobbrt
committed
Finish JDA update
1 parent 7fffdea commit b65a47f

Some content is hidden

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

49 files changed

+280
-263
lines changed

‎relauncher‎

‎src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@
9090
import net.dv8tion.jda.api.Permission;
9191
import net.dv8tion.jda.api.entities.Guild;
9292
import net.dv8tion.jda.api.entities.Message;
93-
import net.dv8tion.jda.api.entities.MessageChannel;
93+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
9494
import net.dv8tion.jda.api.entities.emoji.Emoji;
9595
import net.dv8tion.jda.api.events.Event;
9696
import net.dv8tion.jda.api.events.ReadyEvent;
97+
import net.dv8tion.jda.api.exceptions.InvalidTokenException;
9798
import net.dv8tion.jda.api.hooks.EventListener;
9899
import net.dv8tion.jda.api.requests.GatewayIntent;
99100
import net.dv8tion.jda.api.requests.RestAction;
100-
import net.dv8tion.jda.api.requests.restaction.MessageAction;
101-
import net.dv8tion.jda.api.utils.AllowedMentions;
102101
import net.dv8tion.jda.api.utils.cache.CacheFlag;
102+
import net.dv8tion.jda.api.utils.messages.MessageRequest;
103103
import okhttp3.OkHttpClient;
104104
import org.flywaydb.core.Flyway;
105105
import org.jdbi.v3.core.Jdbi;
@@ -229,7 +229,7 @@ public static Instant getStartupTime() {
229229
public static final String VERSION;
230230

231231
static {
232-
AllowedMentions.setDefaultMentionRepliedUser(false);
232+
MessageRequest.setDefaultMentionRepliedUser(false);
233233

234234
var version = TheCommander.class.getPackage().getImplementationVersion();
235235
if (version == null) {
@@ -330,8 +330,8 @@ public void start() {
330330
jdbi = Jdbi.create(dataSource);
331331
}
332332

333-
MessageAction.setDefaultMentionRepliedUser(false);
334-
MessageAction.setDefaultMentions(DEFAULT_MENTIONS);
333+
MessageRequest.setDefaultMentionRepliedUser(false);
334+
MessageRequest.setDefaultMentions(DEFAULT_MENTIONS);
335335

336336
// Setup components
337337
{
@@ -470,7 +470,7 @@ record SlashCommandRegistration(Object fieldValue, RegisterSlashCommand annotati
470470
.setEnabledIntents(INTENTS);
471471
EventListeners.register(builder::addEventListeners);
472472
jda = builder.build().awaitReady();
473-
} catch (final LoginException exception) {
473+
} catch (final InvalidTokenException exception) {
474474
LOGGER.error("Error logging in the bot! Please give the bot a valid token in the config file.", exception);
475475
System.exit(1);
476476
} catch (InterruptedException e) {

‎src/commander/java/com/mcmoddev/mmdbot/commander/cfwebhooks/CFProject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.mcmoddev.mmdbot.commander.TheCommander;
2626
import io.github.matyrobbrt.curseforgeapi.request.AsyncRequest;
2727
import io.github.matyrobbrt.curseforgeapi.request.Response;
28-
import net.dv8tion.jda.api.entities.IWebhookContainer;
28+
import net.dv8tion.jda.api.entities.channel.attribute.IWebhookContainer;
2929

3030
import java.util.Set;
3131
import java.util.concurrent.atomic.AtomicInteger;

‎src/commander/java/com/mcmoddev/mmdbot/commander/commands/CustomPingsCommand.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
import com.mcmoddev.mmdbot.core.util.builder.SlashCommandBuilder;
3535
import com.mcmoddev.mmdbot.core.util.event.DismissListener;
3636
import net.dv8tion.jda.api.EmbedBuilder;
37-
import net.dv8tion.jda.api.MessageBuilder;
3837
import net.dv8tion.jda.api.entities.Message;
3938
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
4039
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
4140
import net.dv8tion.jda.api.interactions.commands.OptionType;
4241
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
4342
import net.dv8tion.jda.api.interactions.components.ActionRow;
43+
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
44+
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
4445

4546
import java.util.List;
4647
import java.util.Objects;
@@ -73,7 +74,7 @@ private Add() {
7374
protected void execute(final SlashCommandEvent event) {
7475
if (!checkEnabled(event)) return;
7576
final var pings = CustomPings.getPingsForUser(event.getGuild().getIdLong(), event.getUser().getIdLong());
76-
final var limit = Objects.requireNonNull(event.getGuildSettings(GuildConfiguration.class))
77+
final var limit = TheCommander.getInstance().getConfigForGuild(event.getGuild())
7778
.features()
7879
.customPings()
7980
.getLimitPerUser();
@@ -219,12 +220,12 @@ private static boolean checkEnabled(final CommandEvent event) {
219220
return enabled;
220221
}
221222

222-
private static Message buildMessage(final CommandContext context, final String content) {
223-
final var builder = new MessageBuilder(content);
223+
private static MessageCreateData buildMessage(final CommandContext context, final String content) {
224+
final var builder = new MessageCreateBuilder().setContent(content);
224225
if (context.asCommandEvent() != null) {
225-
builder.setActionRows(ActionRow.of(DismissListener.createDismissButton(context.getUser(), context.asCommandEvent().getMessage())));
226+
builder.setComponents(ActionRow.of(DismissListener.createDismissButton(context.getUser(), context.asCommandEvent().getMessage())));
226227
} else {
227-
builder.setActionRows(ActionRow.of(DismissListener.createDismissButton(context.getUser())));
228+
builder.setComponents(ActionRow.of(DismissListener.createDismissButton(context.getUser())));
228229
}
229230
return builder.build();
230231
}

‎src/commander/java/com/mcmoddev/mmdbot/commander/commands/EvaluateCommand.java‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@
3333
import com.mcmoddev.mmdbot.core.util.event.DismissListener;
3434
import com.mcmoddev.mmdbot.core.util.gist.GistUtils;
3535
import io.github.matyrobbrt.curseforgeapi.util.Utils;
36-
import net.dv8tion.jda.api.MessageBuilder;
3736
import net.dv8tion.jda.api.Permission;
38-
import net.dv8tion.jda.api.entities.ChannelType;
37+
import net.dv8tion.jda.api.entities.channel.ChannelType;
3938
import net.dv8tion.jda.api.entities.Guild;
40-
import net.dv8tion.jda.api.entities.GuildChannel;
39+
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
40+
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
4141
import net.dv8tion.jda.api.entities.Member;
4242
import net.dv8tion.jda.api.entities.Message;
43-
import net.dv8tion.jda.api.entities.MessageChannel;
43+
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
4444
import net.dv8tion.jda.api.entities.MessageEmbed;
45-
import net.dv8tion.jda.api.entities.TextChannel;
4645
import net.dv8tion.jda.api.entities.User;
4746
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
4847
import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -52,6 +51,10 @@
5251
import net.dv8tion.jda.api.interactions.components.Modal;
5352
import net.dv8tion.jda.api.interactions.components.text.TextInput;
5453
import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
54+
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
55+
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
56+
import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
57+
import net.dv8tion.jda.api.utils.messages.MessageEditData;
5558
import org.jetbrains.annotations.NotNull;
5659

5760
import javax.annotation.Nonnull;
@@ -110,7 +113,7 @@ protected void execute(final SlashCommandEvent event) {
110113
}
111114
final var scriptOption = event.getOption("script");
112115
if (scriptOption != null) {
113-
event.deferReply().allowedMentions(ALLOWED_MENTIONS)
116+
event.deferReply().setAllowedMentions(ALLOWED_MENTIONS)
114117
.queue(hook -> {
115118
final var context = createInteractionContext(hook);
116119

@@ -153,7 +156,7 @@ public static final class ModalListener extends ListenerAdapter {
153156
@Override
154157
public void onModalInteraction(@NotNull final ModalInteractionEvent event) {
155158
if (event.getModalId().equals(MODAL_ID)) {
156-
event.deferReply().allowedMentions(ALLOWED_MENTIONS).queue(hook -> {
159+
event.deferReply().setAllowedMentions(ALLOWED_MENTIONS).queue(hook -> {
157160
final var context = createInteractionContext(hook);
158161

159162
final var future = EVALUATION_EXECUTOR.submit(() -> {
@@ -210,21 +213,21 @@ public Member getMember() {
210213

211214
@Override
212215
public void reply(final String content) {
213-
hook.editOriginal(new MessageBuilder(content).setAllowedMentions(ALLOWED_MENTIONS).build())
216+
hook.editOriginal(new MessageEditBuilder().setContent(content).setAllowedMentions(ALLOWED_MENTIONS).build())
214217
.setActionRow(DismissListener.createDismissButton(hook.getInteraction().getUser()))
215218
.queue();
216219
}
217220

218221
@Override
219222
public void replyEmbeds(final MessageEmbed... embeds) {
220-
hook.editOriginal(new MessageBuilder().setEmbeds(embeds).setAllowedMentions(ALLOWED_MENTIONS).build())
223+
hook.editOriginal(new MessageEditBuilder().setEmbeds(embeds).setAllowedMentions(ALLOWED_MENTIONS).build())
221224
.setActionRow(DismissListener.createDismissButton(hook.getInteraction().getUser()))
222225
.queue();
223226
}
224227

225228
@Override
226-
public void replyWithMessage(final Message msg) {
227-
hook.editOriginal(msg)
229+
public void replyWithMessage(final MessageCreateData msg) {
230+
hook.editOriginal(MessageEditData.fromCreateData(msg))
228231
.setActionRow(DismissListener.createDismissButton(hook.getInteraction().getUser()))
229232
.queue();
230233
}
@@ -283,19 +286,19 @@ public Member getMember() {
283286

284287
@Override
285288
public void reply(final String content) {
286-
event.getMessage().reply(new MessageBuilder(content).setAllowedMentions(ALLOWED_MENTIONS).build())
289+
event.getMessage().reply(new MessageCreateBuilder().setContent(content).setAllowedMentions(ALLOWED_MENTIONS).build())
287290
.setActionRow(DismissListener.createDismissButton(getUser())).mentionRepliedUser(false).queue();
288291
}
289292

290293
@Override
291294
public void replyEmbeds(final MessageEmbed... embeds) {
292-
event.getMessage().reply(new MessageBuilder().setEmbeds(embeds).setAllowedMentions(ALLOWED_MENTIONS).build())
295+
event.getMessage().reply(new MessageCreateBuilder().setEmbeds(embeds).setAllowedMentions(ALLOWED_MENTIONS).build())
293296
.setActionRow(DismissListener.createDismissButton(getUser())).mentionRepliedUser(false).queue();
294297
}
295298

296299
@Override
297-
public void replyWithMessage(final Message msg) {
298-
event.getMessage().reply(msg).allowedMentions(ALLOWED_MENTIONS)
300+
public void replyWithMessage(final MessageCreateData msg) {
301+
event.getMessage().reply(msg).setAllowedMentions(ALLOWED_MENTIONS)
299302
.setActionRow(DismissListener.createDismissButton(getUser())).mentionRepliedUser(false).queue();
300303
}
301304
});
@@ -338,7 +341,7 @@ public void replyWithMessage(final Message msg) {
338341
return;
339342
}
340343
event.getMessage().reply("There was an exception evaluating: "
341-
+ exception.getLocalizedMessage()).allowedMentions(ALLOWED_MENTIONS)
344+
+ exception.getLocalizedMessage()).setAllowedMentions(ALLOWED_MENTIONS)
342345
.setActionRow(DismissListener.createDismissButton(event.getAuthor())).queue();
343346
}
344347
});
@@ -360,33 +363,33 @@ public static ScriptingContext createContext(EvaluationContext evalContext) {
360363
context.set("channel", createMessageChannel(evalContext.getMessageChannel(), true)
361364
.setFunctionVoid("sendMessage", args -> {
362365
validateArgs(args, 1);
363-
executeAndAddCooldown(evalContext.getMessageChannel(), c -> c.sendMessage(args.get(0).asString()).allowedMentions(ALLOWED_MENTIONS).queue());
366+
executeAndAddCooldown(evalContext.getMessageChannel(), c -> c.sendMessage(args.get(0).asString()).setAllowedMentions(ALLOWED_MENTIONS).queue());
364367
})
365368
.setFunctionVoid("sendEmbed", args -> {
366369
validateArgs(args, 1);
367370
final var v = args.get(0);
368371
final var embed = getEmbedFromValue(v);
369372
if (embed != null) {
370-
executeAndAddCooldown(evalContext.getMessageChannel(), c -> c.sendMessageEmbeds(embed).allowedMentions(ALLOWED_MENTIONS).queue());
373+
executeAndAddCooldown(evalContext.getMessageChannel(), c -> c.sendMessageEmbeds(embed).setAllowedMentions(ALLOWED_MENTIONS).queue());
371374
}
372375
})
373376
.setFunctionVoid("sendEmbeds", args -> executeAndAddCooldown(evalContext.getMessageChannel(), c -> c.sendMessageEmbeds(args.stream().map(ScriptingUtils::getEmbedFromValue)
374-
.filter(Objects::nonNull).limit(3).toList()).allowedMentions(ALLOWED_MENTIONS).queue())));
377+
.filter(Objects::nonNull).limit(3).toList()).setAllowedMentions(ALLOWED_MENTIONS).queue())));
375378
context.set("textChannel", evalContext.getTextChannel() == null ? null : createTextChannel(evalContext.getTextChannel(), true)
376379
.setFunctionVoid("sendMessage", args -> {
377380
validateArgs(args, 1);
378-
executeAndAddCooldown(evalContext.getTextChannel(), c -> c.sendMessage(args.get(0).asString()).allowedMentions(ALLOWED_MENTIONS).queue());
381+
executeAndAddCooldown(evalContext.getTextChannel(), c -> c.sendMessage(args.get(0).asString()).setAllowedMentions(ALLOWED_MENTIONS).queue());
379382
})
380383
.setFunctionVoid("sendEmbed", args -> {
381384
validateArgs(args, 1);
382385
final var v = args.get(0);
383386
final var embed = getEmbedFromValue(v);
384387
if (embed != null) {
385-
executeAndAddCooldown(evalContext.getTextChannel(), c -> c.sendMessageEmbeds(embed).allowedMentions(ALLOWED_MENTIONS).queue());
388+
executeAndAddCooldown(evalContext.getTextChannel(), c -> c.sendMessageEmbeds(embed).setAllowedMentions(ALLOWED_MENTIONS).queue());
386389
}
387390
})
388391
.setFunctionVoid("sendEmbeds", args -> executeAndAddCooldown(evalContext.getTextChannel(), c -> c.sendMessageEmbeds(args.stream().map(ScriptingUtils::getEmbedFromValue)
389-
.filter(Objects::nonNull).toList()).allowedMentions(ALLOWED_MENTIONS).queue())));
392+
.filter(Objects::nonNull).toList()).setAllowedMentions(ALLOWED_MENTIONS).queue())));
390393
context.setFunctionVoid("reply", args -> {
391394
validateArgs(args, 1);
392395
executeAndAddCooldown(evalContext.getMessageChannel(), c -> evalContext.reply(args.get(0).asString()));
@@ -456,7 +459,7 @@ public void replyEmbeds(final MessageEmbed... embeds) {
456459
}
457460

458461
@Override
459-
public void replyWithMessage(final Message message) {
462+
public void replyWithMessage(final MessageCreateData message) {
460463
evalContext.replyWithMessage(message);
461464
}
462465
}));
@@ -484,7 +487,7 @@ public static ScriptingContext overwriteDm(final MessageChannel channel, final b
484487
context.setFunctionVoid("sendMessage", args -> {
485488
validateArgs(args, 1);
486489
executeAndAddCooldown(channel, ch -> {
487-
ch.sendMessage(args.get(0).asString()).allowedMentions(ALLOWED_MENTIONS).queue();
490+
ch.sendMessage(args.get(0).asString()).setAllowedMentions(ALLOWED_MENTIONS).queue();
488491
});
489492
});
490493
context.setFunctionVoid("sendEmbed", args -> {
@@ -493,12 +496,12 @@ public static ScriptingContext overwriteDm(final MessageChannel channel, final b
493496
final var v = args.get(0);
494497
final var embed = getEmbedFromValue(v);
495498
if (embed != null) {
496-
channel.sendMessageEmbeds(embed).allowedMentions(ALLOWED_MENTIONS).queue();
499+
channel.sendMessageEmbeds(embed).setAllowedMentions(ALLOWED_MENTIONS).queue();
497500
}
498501
});
499502
});
500503
context.setFunctionVoid("sendEmbeds", args -> executeAndAddCooldown(channel, ch -> ch.sendMessageEmbeds(args.stream().map(ScriptingUtils::getEmbedFromValue)
501-
.filter(Objects::nonNull).limit(3).toList()).allowedMentions(ALLOWED_MENTIONS).queue()));
504+
.filter(Objects::nonNull).limit(3).toList()).setAllowedMentions(ALLOWED_MENTIONS).queue()));
502505
}
503506
return context;
504507
}
@@ -531,6 +534,6 @@ interface EvaluationContext {
531534

532535
void replyEmbeds(MessageEmbed... embeds);
533536

534-
void replyWithMessage(Message msg);
537+
void replyWithMessage(MessageCreateData msg);
535538
}
536539
}

‎src/commander/java/com/mcmoddev/mmdbot/commander/commands/RemindCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.mcmoddev.mmdbot.core.util.builder.SlashCommandBuilder;
3535
import com.mcmoddev.mmdbot.core.util.event.DismissListener;
3636
import net.dv8tion.jda.api.EmbedBuilder;
37-
import net.dv8tion.jda.api.entities.ChannelType;
37+
import net.dv8tion.jda.api.entities.channel.ChannelType;
3838
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
3939
import net.dv8tion.jda.api.interactions.commands.OptionType;
4040
import net.dv8tion.jda.api.interactions.commands.build.OptionData;

0 commit comments

Comments
 (0)