diff --git a/pom.xml b/pom.xml
index 976e349..6234a97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
net.dv8tion
JDA
- 5.6.1
+ 6.1.1
dev.arbjerg
diff --git a/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java b/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java
index 4275ad3..56a4a60 100644
--- a/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java
+++ b/src/main/java/me/bobert/netneutrality/command/basic/HelpCommand.java
@@ -18,9 +18,9 @@ import me.bobert.netneutrality.tasks.help.BotInfo;
import me.bobert.netneutrality.tasks.help.CommandHelp;
import me.bobert.netneutrality.tasks.help.ReportBug;
import me.bobert.netneutrality.utils.MessageFunction;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
import java.util.List;
diff --git a/src/main/java/me/bobert/netneutrality/context/AsyncContext.java b/src/main/java/me/bobert/netneutrality/context/AsyncContext.java
index a4ca65e..b322acd 100644
--- a/src/main/java/me/bobert/netneutrality/context/AsyncContext.java
+++ b/src/main/java/me/bobert/netneutrality/context/AsyncContext.java
@@ -6,12 +6,12 @@ package me.bobert.netneutrality.context;
*/
import me.bobert.netneutrality.core.context.AbstractContext;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.events.Event;
import net.dv8tion.jda.api.interactions.InteractionHook;
-import net.dv8tion.jda.api.interactions.components.LayoutComponent;
-import net.dv8tion.jda.api.interactions.modals.Modal;
+import net.dv8tion.jda.api.modals.Modal;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
import net.dv8tion.jda.api.utils.messages.MessageEditData;
@@ -97,7 +97,7 @@ public class AsyncContext extends AbstractContext {
}
@Override
- public void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
+ public void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
if (hook != null) {
hook.sendMessage(messageCreateData).queue();
}
@@ -118,7 +118,7 @@ public class AsyncContext extends AbstractContext {
}
@Override
- public void edit(MessageEditData messageEditData, boolean ephemeral, List components, Consumer consumer) {
+ public void edit(MessageEditData messageEditData, boolean ephemeral, List components, Consumer consumer) {
if (hook != null) {
hook.editOriginal(messageEditData).queue();
}
diff --git a/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java b/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java
index 7dd80f3..c5236f8 100644
--- a/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java
+++ b/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java
@@ -7,10 +7,10 @@ package me.bobert.netneutrality.context;
import me.bobert.netneutrality.core.context.AbstractContext;
import me.bobert.netneutrality.core.context.NoMessageContext;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import net.dv8tion.jda.api.events.Event;
-import net.dv8tion.jda.api.interactions.components.LayoutComponent;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
import java.util.List;
@@ -43,7 +43,7 @@ public class MusicChannelContext extends AbstractContext implements NoMessageCon
}
@Override
- public void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
+ public void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
if (getChannel().canTalk()) {
getChannel().sendMessage(messageCreateData).setComponents(components).queue(message -> consumer.accept(new AsyncContext(message)));
}
diff --git a/src/main/java/me/bobert/netneutrality/context/tasks/EmojiTaskContext.java b/src/main/java/me/bobert/netneutrality/context/tasks/EmojiTaskContext.java
index b9b9563..5bea3b7 100644
--- a/src/main/java/me/bobert/netneutrality/context/tasks/EmojiTaskContext.java
+++ b/src/main/java/me/bobert/netneutrality/context/tasks/EmojiTaskContext.java
@@ -8,8 +8,8 @@ package me.bobert.netneutrality.context.tasks;
import me.bobert.netneutrality.context.AsyncContext;
import me.bobert.netneutrality.core.context.NoMessageContext;
import me.bobert.netneutrality.core.context.TaskContext;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
-import net.dv8tion.jda.api.interactions.components.LayoutComponent;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
import java.util.List;
@@ -42,7 +42,7 @@ public class EmojiTaskContext extends TaskContext implements NoMessageContext {
}
@Override
- public void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
+ public void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
if (getChannel() != null && getChannel().canTalk()) {
getChannel().sendMessage(messageCreateData).setComponents(components).queue(message -> consumer.accept(new AsyncContext(message)));
}
diff --git a/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java b/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java
index d3459f0..258a0e3 100644
--- a/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java
+++ b/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java
@@ -73,11 +73,6 @@ public class CommandOptionsBuilder implements SlashCommandData {
return commandData.setDefaultPermissions(permission);
}
- @Override
- public @Nonnull SlashCommandData setGuildOnly(boolean guildOnly) {
- return commandData.setGuildOnly(guildOnly);
- }
-
@Override
public @Nonnull SlashCommandData setContexts(@Nonnull Collection contexts) {
return commandData.setContexts(contexts);
@@ -113,11 +108,6 @@ public class CommandOptionsBuilder implements SlashCommandData {
return commandData.getDefaultPermissions();
}
- @Override
- public boolean isGuildOnly() {
- return commandData.isGuildOnly();
- }
-
@Override
public @Nonnull Set getContexts() {
return commandData.getContexts();
diff --git a/src/main/java/me/bobert/netneutrality/core/context/Context.java b/src/main/java/me/bobert/netneutrality/core/context/Context.java
index 2127c62..82e6462 100644
--- a/src/main/java/me/bobert/netneutrality/core/context/Context.java
+++ b/src/main/java/me/bobert/netneutrality/core/context/Context.java
@@ -8,6 +8,7 @@ package me.bobert.netneutrality.core.context;
import me.bobert.netneutrality.context.AsyncContext;
import me.bobert.netneutrality.utils.ContextUtils;
import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
@@ -17,8 +18,7 @@ import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.events.Event;
import net.dv8tion.jda.api.interactions.InteractionHook;
-import net.dv8tion.jda.api.interactions.components.LayoutComponent;
-import net.dv8tion.jda.api.interactions.modals.Modal;
+import net.dv8tion.jda.api.modals.Modal;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
import net.dv8tion.jda.api.utils.messages.MessageEditData;
@@ -52,7 +52,7 @@ public interface Context {
void reply(Modal modal);
- void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer);
+ void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer);
void defer(boolean ephemeral, Consumer consumer);
@@ -70,7 +70,7 @@ public interface Context {
reply(messageCreateData, false, List.of(), asyncMessage -> {});
}
- default void reply(MessageCreateData messageCreateData, List components) {
+ default void reply(MessageCreateData messageCreateData, List components) {
reply(messageCreateData, false, components, asyncMessage -> {});
}
@@ -94,7 +94,7 @@ public interface Context {
reply(MessageCreateData.fromEmbeds(embeds));
}
- default void edit(MessageEditData messageEditData, boolean ephemeral, List components, Consumer consumer) {
+ default void edit(MessageEditData messageEditData, boolean ephemeral, List components, Consumer consumer) {
if (isAcknowledged() && getInteractionHook() != null) {
getInteractionHook().editOriginal(messageEditData).setComponents(components).queue(message1 -> consumer.accept(new AsyncContext(message1)));
return;
@@ -103,7 +103,7 @@ public interface Context {
reply(MessageCreateData.fromEditData(messageEditData), ephemeral, components, consumer);
}
- default void edit(MessageEditData messageEditData, List components) {
+ default void edit(MessageEditData messageEditData, List components) {
edit(messageEditData, false, components, asyncMessage -> {});
}
@@ -119,11 +119,11 @@ public interface Context {
edit(List.of(embed), List.of());
}
- default void edit(List embeds, List components) {
+ default void edit(List embeds, List components) {
edit(MessageEditData.fromEmbeds(embeds), components);
}
- default void edit(MessageEmbed embed, List components) {
+ default void edit(MessageEmbed embed, List components) {
edit(List.of(embed), components);
}
@@ -139,7 +139,7 @@ public interface Context {
defer(false, consumer);
}
- default void replyEphemeral(MessageCreateData messageCreateData, List components) {
+ default void replyEphemeral(MessageCreateData messageCreateData, List components) {
reply(messageCreateData, true, components, asyncMessage -> {});
}
@@ -151,11 +151,11 @@ public interface Context {
replyEphemeralWithLimit(message);
}
- default void replyEphemeral(String message, LayoutComponent component) {
+ default void replyEphemeral(String message, MessageTopLevelComponent component) {
replyEphemeral(message, List.of(component));
}
- default void replyEphemeral(String message, List components) {
+ default void replyEphemeral(String message, List components) {
replyEphemeral(MessageCreateData.fromContent(message), components);
}
@@ -163,7 +163,7 @@ public interface Context {
replyEphemeral(MessageCreateData.fromEmbeds(embeds));
}
- default void sendMessageInPrivate(MessageCreateData messageCreateData, List components, Consumer consumer) {
+ default void sendMessageInPrivate(MessageCreateData messageCreateData, List components, Consumer consumer) {
User user = getDiscordUser();
if (user != null) {
user.openPrivateChannel()
@@ -172,11 +172,11 @@ public interface Context {
}
}
- default void sendMessageInPrivate(String message, List components, Consumer consumer) {
+ default void sendMessageInPrivate(String message, List components, Consumer consumer) {
sendMessageInPrivate(MessageCreateData.fromContent(message), components, consumer);
}
- default void sendMessageInPrivate(MessageCreateData messageCreateData, List components) {
+ default void sendMessageInPrivate(MessageCreateData messageCreateData, List components) {
sendMessageInPrivate(messageCreateData, components, asyncContext -> {});
}
diff --git a/src/main/java/me/bobert/netneutrality/core/context/InteractionContext.java b/src/main/java/me/bobert/netneutrality/core/context/InteractionContext.java
index 9008e75..f2db948 100644
--- a/src/main/java/me/bobert/netneutrality/core/context/InteractionContext.java
+++ b/src/main/java/me/bobert/netneutrality/core/context/InteractionContext.java
@@ -6,12 +6,12 @@ package me.bobert.netneutrality.core.context;
*/
import me.bobert.netneutrality.context.AsyncContext;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
import net.dv8tion.jda.api.interactions.Interaction;
import net.dv8tion.jda.api.interactions.InteractionHook;
import net.dv8tion.jda.api.interactions.callbacks.IModalCallback;
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
-import net.dv8tion.jda.api.interactions.components.LayoutComponent;
-import net.dv8tion.jda.api.interactions.modals.Modal;
+import net.dv8tion.jda.api.modals.Modal;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
import java.util.List;
@@ -58,7 +58,7 @@ public interface InteractionContext extends Context {
}
@Override
- default void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
+ default void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
if (isAcknowledged()) {
getInteractionHook().sendMessage(messageCreateData).setEphemeral(ephemeral).setComponents(components).queue(message -> consumer.accept(new AsyncContext(message)));
return;
diff --git a/src/main/java/me/bobert/netneutrality/core/context/MessageContext.java b/src/main/java/me/bobert/netneutrality/core/context/MessageContext.java
index cf33c24..c0266d5 100644
--- a/src/main/java/me/bobert/netneutrality/core/context/MessageContext.java
+++ b/src/main/java/me/bobert/netneutrality/core/context/MessageContext.java
@@ -7,9 +7,9 @@ package me.bobert.netneutrality.core.context;
*/
import me.bobert.netneutrality.context.AsyncContext;
+import net.dv8tion.jda.api.components.MessageTopLevelComponent;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.channel.ChannelType;
-import net.dv8tion.jda.api.interactions.components.LayoutComponent;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
import java.util.List;
@@ -32,7 +32,7 @@ public interface MessageContext extends NoMessageContext {
}
@Override
- default void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
+ default void reply(MessageCreateData messageCreateData, boolean ephemeral, List components, Consumer consumer) {
if (ephemeral && getType() != ChannelType.PRIVATE) {
sendMessageInPrivate(messageCreateData, components);
return;
diff --git a/src/main/java/me/bobert/netneutrality/core/context/NoMessageContext.java b/src/main/java/me/bobert/netneutrality/core/context/NoMessageContext.java
index 1aeea14..fe0b90f 100644
--- a/src/main/java/me/bobert/netneutrality/core/context/NoMessageContext.java
+++ b/src/main/java/me/bobert/netneutrality/core/context/NoMessageContext.java
@@ -9,7 +9,7 @@ package me.bobert.netneutrality.core.context;
import me.bobert.netneutrality.context.AsyncContext;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.interactions.InteractionHook;
-import net.dv8tion.jda.api.interactions.modals.Modal;
+import net.dv8tion.jda.api.modals.Modal;
import java.util.function.Consumer;
diff --git a/src/main/java/me/bobert/netneutrality/core/tasks/Task.java b/src/main/java/me/bobert/netneutrality/core/tasks/Task.java
index 7db15f0..1707e71 100644
--- a/src/main/java/me/bobert/netneutrality/core/tasks/Task.java
+++ b/src/main/java/me/bobert/netneutrality/core/tasks/Task.java
@@ -9,7 +9,7 @@ import me.bobert.netneutrality.core.context.CommandContext;
import me.bobert.netneutrality.core.context.TaskContext;
import me.bobert.netneutrality.core.tasks.trait.WithButton;
import me.bobert.netneutrality.core.tasks.trait.WithChildren;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.Button;
import java.time.OffsetDateTime;
diff --git a/src/main/java/me/bobert/netneutrality/core/tasks/impl/ButtonTask.java b/src/main/java/me/bobert/netneutrality/core/tasks/impl/ButtonTask.java
index 27dc14d..b5ec995 100644
--- a/src/main/java/me/bobert/netneutrality/core/tasks/impl/ButtonTask.java
+++ b/src/main/java/me/bobert/netneutrality/core/tasks/impl/ButtonTask.java
@@ -7,9 +7,9 @@ package me.bobert.netneutrality.core.tasks.impl;
import me.bobert.netneutrality.core.tasks.Task;
import me.bobert.netneutrality.core.tasks.trait.WithButton;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
import net.dv8tion.jda.api.entities.emoji.Emoji;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
import java.time.OffsetDateTime;
diff --git a/src/main/java/me/bobert/netneutrality/core/tasks/impl/ModalTask.java b/src/main/java/me/bobert/netneutrality/core/tasks/impl/ModalTask.java
index c16a680..ee331bf 100644
--- a/src/main/java/me/bobert/netneutrality/core/tasks/impl/ModalTask.java
+++ b/src/main/java/me/bobert/netneutrality/core/tasks/impl/ModalTask.java
@@ -10,6 +10,7 @@ import net.dv8tion.jda.api.interactions.modals.ModalMapping;
import java.time.OffsetDateTime;
import java.util.List;
+import java.util.Optional;
public abstract class ModalTask extends GenericRandomIdTask {
@@ -18,12 +19,12 @@ public abstract class ModalTask extends GenericRandomIdTask {
return getCreationTime().plusMinutes(5).isBefore(OffsetDateTime.now());
}
- public ModalMapping getValue(String key, TaskContext context) {
+ public Optional getValue(String key, TaskContext context) {
List mappings = (List) context.getContextData("values");
return mappings.stream()
.filter(o -> o instanceof ModalMapping)
.map(o -> (ModalMapping) o)
- .filter(mapping -> mapping.getId().equals(key))
- .findFirst().orElse(null);
+ .filter(mapping -> mapping.getCustomId().equals(key))
+ .findFirst();
}
}
diff --git a/src/main/java/me/bobert/netneutrality/core/tasks/trait/WithButton.java b/src/main/java/me/bobert/netneutrality/core/tasks/trait/WithButton.java
index 2603df3..aed5f53 100644
--- a/src/main/java/me/bobert/netneutrality/core/tasks/trait/WithButton.java
+++ b/src/main/java/me/bobert/netneutrality/core/tasks/trait/WithButton.java
@@ -7,8 +7,8 @@ package me.bobert.netneutrality.core.tasks.trait;
*/
import me.bobert.netneutrality.core.tasks.Task;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
import java.util.List;
diff --git a/src/main/java/me/bobert/netneutrality/tasks/generic/AcceptButton.java b/src/main/java/me/bobert/netneutrality/tasks/generic/AcceptButton.java
index 59a58e6..af27ff4 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/generic/AcceptButton.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/generic/AcceptButton.java
@@ -7,11 +7,11 @@ package me.bobert.netneutrality.tasks.generic;
*/
import me.bobert.netneutrality.core.context.TaskContext;
+import me.bobert.netneutrality.core.tasks.impl.ButtonTask;
import me.bobert.netneutrality.core.tasks.trait.NotAcknowledgeable;
import me.bobert.netneutrality.core.tasks.trait.WithChildren;
import me.bobert.netneutrality.core.tasks.trait.WithParent;
-import me.bobert.netneutrality.core.tasks.impl.ButtonTask;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
import java.util.function.Function;
diff --git a/src/main/java/me/bobert/netneutrality/tasks/generic/CancelButton.java b/src/main/java/me/bobert/netneutrality/tasks/generic/CancelButton.java
index 0d5e8ac..00fcee0 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/generic/CancelButton.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/generic/CancelButton.java
@@ -7,11 +7,11 @@ package me.bobert.netneutrality.tasks.generic;
*/
import me.bobert.netneutrality.core.context.TaskContext;
+import me.bobert.netneutrality.core.tasks.impl.ButtonTask;
import me.bobert.netneutrality.core.tasks.trait.NotAcknowledgeable;
import me.bobert.netneutrality.core.tasks.trait.WithChildren;
import me.bobert.netneutrality.core.tasks.trait.WithParent;
-import me.bobert.netneutrality.core.tasks.impl.ButtonTask;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
import java.util.function.Function;
diff --git a/src/main/java/me/bobert/netneutrality/tasks/git/ReportIssueTask.java b/src/main/java/me/bobert/netneutrality/tasks/git/ReportIssueTask.java
index 320a234..eb8bf50 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/git/ReportIssueTask.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/git/ReportIssueTask.java
@@ -12,12 +12,12 @@ import me.bobert.netneutrality.core.context.CommandContext;
import me.bobert.netneutrality.core.context.TaskContext;
import me.bobert.netneutrality.core.tasks.impl.ModalTask;
import me.bobert.netneutrality.utils.Settings;
+import net.dv8tion.jda.api.components.label.Label;
+import net.dv8tion.jda.api.components.textinput.TextInput;
+import net.dv8tion.jda.api.components.textinput.TextInputStyle;
import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.text.TextInput;
-import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
-import net.dv8tion.jda.api.interactions.modals.Modal;
import net.dv8tion.jda.api.interactions.modals.ModalMapping;
+import net.dv8tion.jda.api.modals.Modal;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.gitlab4j.api.GitLabApi;
@@ -44,20 +44,21 @@ public class ReportIssueTask extends ModalTask {
@Override
public void replyToInteraction(CommandContext context) {
- TextInput title = TextInput.create("title", "Title", TextInputStyle.SHORT)
+
+ Label title = Label.of("Title", TextInput.create("title", TextInputStyle.SHORT)
.setPlaceholder("Brief description of the issue.")
.setMinLength(10)
.setMaxLength(100)
- .build();
+ .build());
- TextInput body = TextInput.create("description", "Description", TextInputStyle.PARAGRAPH)
+ Label body = Label.of("Description", TextInput.create("description", TextInputStyle.PARAGRAPH)
.setPlaceholder("And I scream from the top of my lungs What's going on?")
.setMinLength(30)
.setMaxLength(1000)
- .build();
+ .build());
Modal modal = Modal.create(getId(), "Report a bug")
- .addComponents(ActionRow.of(title), ActionRow.of(body))
+ .addComponents(title, body)
.build();
context.reply(modal);
@@ -77,8 +78,8 @@ public class ReportIssueTask extends ModalTask {
return null;
}
- ModalMapping modalTitle = getValue("title", context);
- ModalMapping modalDescription = getValue("description", context);
+ ModalMapping modalTitle = getValue("title", context).orElse(null);
+ ModalMapping modalDescription = getValue("description", context).orElse(null);
if (modalTitle == null || modalDescription == null) {
context.reply("Failed to create issue.");
diff --git a/src/main/java/me/bobert/netneutrality/tasks/help/BotInfo.java b/src/main/java/me/bobert/netneutrality/tasks/help/BotInfo.java
index ccb717d..8a017d1 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/help/BotInfo.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/help/BotInfo.java
@@ -9,7 +9,7 @@ import me.bobert.netneutrality.core.context.TaskContext;
import me.bobert.netneutrality.core.tasks.impl.AbstractBuiltInTask;
import me.bobert.netneutrality.core.tasks.trait.WithButton;
import me.bobert.netneutrality.utils.Settings;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.Button;
public class BotInfo extends AbstractBuiltInTask implements WithButton {
diff --git a/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java b/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java
index 88089d3..30efd2d 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/help/CommandHelp.java
@@ -10,7 +10,7 @@ import me.bobert.netneutrality.core.tasks.impl.AbstractBuiltInTask;
import me.bobert.netneutrality.core.tasks.trait.WithButton;
import me.bobert.netneutrality.utils.MessageFunction;
import me.bobert.netneutrality.utils.Settings;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.Button;
public class CommandHelp extends AbstractBuiltInTask implements WithButton {
diff --git a/src/main/java/me/bobert/netneutrality/tasks/help/ReportBug.java b/src/main/java/me/bobert/netneutrality/tasks/help/ReportBug.java
index 830b965..87cd262 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/help/ReportBug.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/help/ReportBug.java
@@ -9,7 +9,7 @@ import me.bobert.netneutrality.core.context.TaskContext;
import me.bobert.netneutrality.core.tasks.impl.AbstractBuiltInTask;
import me.bobert.netneutrality.core.tasks.trait.WithButton;
import me.bobert.netneutrality.utils.Settings;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.Button;
public class ReportBug extends AbstractBuiltInTask implements WithButton {
diff --git a/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java b/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java
index 089c90d..d28a7b6 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/music/LoadPlaylistTask.java
@@ -10,20 +10,20 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import me.bobert.netneutrality.core.context.CommandContext;
import me.bobert.netneutrality.core.tasks.Task;
import me.bobert.netneutrality.core.tasks.TaskManager;
+import me.bobert.netneutrality.core.tasks.impl.ButtonTask;
import me.bobert.netneutrality.core.tasks.trait.Deletable;
import me.bobert.netneutrality.core.tasks.trait.WithChildren;
import me.bobert.netneutrality.db.GSettings;
import me.bobert.netneutrality.db.service.GuildService;
import me.bobert.netneutrality.music.MusicManager;
import me.bobert.netneutrality.music.SourceFinder;
-import me.bobert.netneutrality.core.tasks.impl.ButtonTask;
import me.bobert.netneutrality.tasks.generic.AcceptButton;
import me.bobert.netneutrality.tasks.generic.CancelButton;
import me.bobert.netneutrality.utils.MessageFunction;
import me.bobert.netneutrality.utils.MusicUtils;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.emoji.Emoji;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java b/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java
index f9cd164..6c04d29 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/music/LoadTrackFromPlaylistTask.java
@@ -11,8 +11,8 @@ import me.bobert.netneutrality.music.SourceFinder;
import me.bobert.netneutrality.tasks.generic.AcceptButton;
import me.bobert.netneutrality.utils.MessageFunction;
import me.bobert.netneutrality.utils.MusicUtils;
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
public class LoadTrackFromPlaylistTask extends AcceptButton {
private final AudioTrack track;
diff --git a/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiRoleModify.java b/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiRoleModify.java
index ca442fd..96776b2 100644
--- a/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiRoleModify.java
+++ b/src/main/java/me/bobert/netneutrality/tasks/reaction/EmojiRoleModify.java
@@ -13,8 +13,8 @@ import me.bobert.netneutrality.core.tasks.impl.ButtonTask;
import me.bobert.netneutrality.core.tasks.trait.WithChildren;
import me.bobert.netneutrality.tasks.emoji.EmojiReactionRoleTask;
import me.bobert.netneutrality.tasks.generic.AcceptButton;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
import java.util.ArrayList;
import java.util.List;