Merge pull request #265 from Java-Discord/dynxsty/jda_alpha_10

jasonlessenich · web-flow · commit 0e95bcf90185 · 2022-04-21T15:03:04.000+02:00
Bumped JDA to latest version `(5492a76)`
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 
-    implementation 'com.github.Xirado:JDA:6adee1ec24'
+    implementation 'com.github.DV8FromTheWorld:JDA:5492a76bce'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'org.yaml:snakeyaml:1.29'
     implementation 'com.google.re2j:re2j:1.6'
diff --git a/src/main/java/net/javadiscord/javabot/command/DelegatingCommandHandler.java b/src/main/java/net/javadiscord/javabot/command/DelegatingCommandHandler.java
@@ -1,7 +1,6 @@
 package net.javadiscord.javabot.command;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.javadiscord.javabot.command.interfaces.SlashCommand;
@@ -93,7 +92,7 @@ protected void addSubcommandGroup(String name, SlashCommand handler) {
 	 * @return The reply action that is sent to the user.
 	 */
 	@Override
-	public InteractionCallbackAction<InteractionHook> handleSlashCommandInteraction(SlashCommandInteractionEvent event) throws ResponseException {
+	public InteractionCallbackAction<?> handleSlashCommandInteraction(SlashCommandInteractionEvent event) throws ResponseException {
 		// First we check if the event has specified a subcommand group, and if we have a group handler for it.
 		if (event.getSubcommandGroup() != null) {
 			SlashCommand groupHandler = this.getSubcommandGroupHandlers().get(event.getSubcommandGroup());
diff --git a/src/main/java/net/javadiscord/javabot/command/interfaces/MessageContextCommand.java b/src/main/java/net/javadiscord/javabot/command/interfaces/MessageContextCommand.java
@@ -1,13 +1,12 @@
 package net.javadiscord.javabot.command.interfaces;
 
 import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
-import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.javadiscord.javabot.command.ResponseException;
 
 /**
  * Interface that handles Discord's Message Context Commands.
  */
 public interface MessageContextCommand {
-	InteractionCallbackAction<InteractionHook> handleMessageContextCommandInteraction(MessageContextInteractionEvent event) throws ResponseException;
+	InteractionCallbackAction<?> handleMessageContextCommandInteraction(MessageContextInteractionEvent event) throws ResponseException;
 }
diff --git a/src/main/java/net/javadiscord/javabot/command/interfaces/SlashCommand.java b/src/main/java/net/javadiscord/javabot/command/interfaces/SlashCommand.java
@@ -1,7 +1,6 @@
 package net.javadiscord.javabot.command.interfaces;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.javadiscord.javabot.command.ResponseException;
 
@@ -21,5 +20,5 @@
  * </p>
  */
 public interface SlashCommand {
-	InteractionCallbackAction<InteractionHook> handleSlashCommandInteraction(SlashCommandInteractionEvent event) throws ResponseException;
+	InteractionCallbackAction<?> handleSlashCommandInteraction(SlashCommandInteractionEvent event) throws ResponseException;
 }
diff --git a/src/main/java/net/javadiscord/javabot/command/interfaces/UserContextCommand.java b/src/main/java/net/javadiscord/javabot/command/interfaces/UserContextCommand.java
@@ -1,13 +1,12 @@
 package net.javadiscord.javabot.command.interfaces;
 
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
-import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.javadiscord.javabot.command.ResponseException;
 
 /**
  * Interface that handles Discord's User Context Commands.
  */
 public interface UserContextCommand {
-	InteractionCallbackAction<InteractionHook> handleUserContextCommandInteraction(UserContextInteractionEvent event) throws ResponseException;
+	InteractionCallbackAction<?> handleUserContextCommandInteraction(UserContextInteractionEvent event) throws ResponseException;
 }
diff --git a/src/main/java/net/javadiscord/javabot/systems/commands/FormatCodeCommand.java b/src/main/java/net/javadiscord/javabot/systems/commands/FormatCodeCommand.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.javadiscord.javabot.command.Responses;
 import net.javadiscord.javabot.command.interfaces.MessageContextCommand;
@@ -55,7 +56,7 @@ public ReplyCallbackAction handleSlashCommandInteraction(SlashCommandInteraction
 	}
 
 	@Override
-	public ReplyCallbackAction handleMessageContextCommandInteraction(MessageContextInteractionEvent event) {
+	public InteractionCallbackAction<?> handleMessageContextCommandInteraction(MessageContextInteractionEvent event) {
 		return event.replyFormat("```java\n%s\n```", StringUtils.standardSanitizer().compute(event.getTarget().getContentRaw()))
 				.allowedMentions(List.of())
 				.addActionRows(this.buildActionRow(event.getTarget()));
diff --git a/src/main/java/net/javadiscord/javabot/systems/moderation/ReportCommand.java b/src/main/java/net/javadiscord/javabot/systems/moderation/ReportCommand.java
@@ -18,7 +18,6 @@
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.javadiscord.javabot.Bot;
-import net.javadiscord.javabot.command.ResponseException;
 import net.javadiscord.javabot.command.Responses;
 import net.javadiscord.javabot.command.interfaces.MessageContextCommand;
 import net.javadiscord.javabot.command.interfaces.UserContextCommand;
@@ -50,7 +49,7 @@ private Modal buildUserReportModal(UserContextInteractionEvent event) {
 				.setMaxLength(MessageEmbed.VALUE_MAX_LENGTH)
 				.build();
 		String title = "Report " + event.getTarget().getAsTag();
-		return Modal.create("report:user:" + event.getTarget().getId(), title.substring(0, Math.min(title.length(), Modal.TITLE_MAX_LENGTH)))
+		return Modal.create("report:user:" + event.getTarget().getId(), title.substring(0, Math.min(title.length(), Modal.MAX_TITLE_LENGTH)))
 				.addActionRows(ActionRow.of(messageInput))
 				.build();
 	}
@@ -71,7 +70,7 @@ private Modal buildMessageReportModal(MessageContextInteractionEvent event) {
 		TextInput messageInput = TextInput.create(REASON_OPTION_NAME, "Report Description", TextInputStyle.PARAGRAPH)
 				.setMaxLength(MessageEmbed.VALUE_MAX_LENGTH)
 				.build();
-		return Modal.create("report:message:" + event.getTarget().getId(), title.substring(0, Math.min(title.length(), Modal.TITLE_MAX_LENGTH)))
+		return Modal.create("report:message:" + event.getTarget().getId(), title.substring(0, Math.min(title.length(), Modal.MAX_TITLE_LENGTH)))
 				.addActionRows(ActionRow.of(messageInput))
 				.build();
 	}
@@ -188,23 +187,23 @@ private EmbedBuilder buildReportEmbed(User reported, String reason, User reporte
 	}
 
 	@Override
-	public InteractionCallbackAction<InteractionHook> handleMessageContextCommandInteraction(MessageContextInteractionEvent event) throws ResponseException {
+	public InteractionCallbackAction<?> handleMessageContextCommandInteraction(MessageContextInteractionEvent event) {
 		if (event.getTarget().getAuthor().equals(event.getUser())) {
 			return Responses.error(event, "You cannot perform this action on yourself.");
 		}
 		return event.replyModal(this.buildMessageReportModal(event));
 	}
 
 	@Override
-	public InteractionCallbackAction<InteractionHook> handleUserContextCommandInteraction(UserContextInteractionEvent event) throws ResponseException {
+	public InteractionCallbackAction<?> handleUserContextCommandInteraction(UserContextInteractionEvent event) {
 		if (event.getTarget().equals(event.getUser())) {
 			return Responses.error(event, "You cannot perform this action on yourself.");
 		}
 		return event.replyModal(this.buildUserReportModal(event));
 	}
 
 	@Override
-	protected ReplyCallbackAction handleModerationActionCommand(SlashCommandInteractionEvent event, Member commandUser, Member target) throws ResponseException {
+	protected ReplyCallbackAction handleModerationActionCommand(SlashCommandInteractionEvent event, Member commandUser, Member target) {
 		this.handleUserReport(event.getHook(), event.getOption("reason", "N/A", OptionMapping::getAsString), commandUser.getUser(), target.getId());
 		return event.deferReply(true);
 	}
diff --git a/src/main/java/net/javadiscord/javabot/systems/moderation/warn/WarnsCommand.java b/src/main/java/net/javadiscord/javabot/systems/moderation/warn/WarnsCommand.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
+import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.command.ResponseException;
@@ -39,7 +40,7 @@ public ReplyCallbackAction handleSlashCommandInteraction(SlashCommandInteraction
 	}
 
 	@Override
-	public ReplyCallbackAction handleUserContextCommandInteraction(UserContextInteractionEvent event) throws ResponseException {
+	public InteractionCallbackAction<?> handleUserContextCommandInteraction(UserContextInteractionEvent event) throws ResponseException {
 		LocalDateTime cutoff = LocalDateTime.now().minusDays(Bot.config.get(event.getGuild()).getModeration().getWarnTimeoutDays());
 		Member member = event.getTargetMember();
 		try (var con = Bot.dataSource.getConnection()) {
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff/self_roles/SelfRoleCommandHandler.java b/src/main/java/net/javadiscord/javabot/systems/staff/self_roles/SelfRoleCommandHandler.java
@@ -1,7 +1,6 @@
 package net.javadiscord.javabot.systems.staff.self_roles;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.javadiscord.javabot.command.DelegatingCommandHandler;
 import net.javadiscord.javabot.command.ResponseException;
@@ -24,7 +23,7 @@ public SelfRoleCommandHandler() {
 	}
 
 	@Override
-	public InteractionCallbackAction<InteractionHook> handleSlashCommandInteraction(SlashCommandInteractionEvent event) {
+	public InteractionCallbackAction<?> handleSlashCommandInteraction(SlashCommandInteractionEvent event) {
 		try {
 			return super.handleSlashCommandInteraction(event);
 		} catch(ResponseException e) {
