fix deprecated addActionRows

Author: danthe1st

src/main/java/net/javadiscord/javabot/data/h2db/DbHelper.java

@@ -22,7 +22,6 @@
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -38,8 +37,6 @@
 public class DbHelper {
 	@Getter
 	private final DataSource dataSource;
-	private final ExecutorService asyncPool;
-	private final BotConfig botConfig;
 
 	/**
 	 * Initializes the data source that'll be used throughout the bot to access

src/main/java/net/javadiscord/javabot/data/h2db/commands/QuickMigrateSubcommand.java

@@ -118,7 +118,7 @@ CREATE TABLE my_table (
 				.setRequired(true)
 				.build();
 		return Modal.create("quick-migrate", "Quick Migrate")
-				.addActionRows(ActionRow.of(sqlInput), ActionRow.of(confirmInput))
+				.addComponents(ActionRow.of(sqlInput), ActionRow.of(confirmInput))
 				.build();
 	}
 }

src/main/java/net/javadiscord/javabot/systems/moderation/report/ReportManager.java

@@ -88,7 +88,7 @@ protected Modal buildUserReportModal(@NotNull UserContextInteractionEvent event)
 				.build();
 		String title = "Report " + event.getTarget().getAsTag();
 		return Modal.create(ComponentIdBuilder.build("report", "user", event.getTarget().getId()), title.substring(0, Math.min(title.length(), Modal.MAX_TITLE_LENGTH)))
-				.addActionRows(ActionRow.of(messageInput))
+				.addActionRow(messageInput)
 				.build();
 	}
 
@@ -109,7 +109,7 @@ protected Modal buildMessageReportModal(@NotNull MessageContextInteractionEvent
 				.setMaxLength(MessageEmbed.VALUE_MAX_LENGTH)
 				.build();
 		return Modal.create(ComponentIdBuilder.build("report", "message", event.getTarget().getId()), title.substring(0, Math.min(title.length(), Modal.MAX_TITLE_LENGTH)))
-				.addActionRows(ActionRow.of(messageInput))
+				.addComponents(ActionRow.of(messageInput))
 				.build();
 	}
 

src/main/java/net/javadiscord/javabot/systems/qotw/commands/questions_queue/AddQuestionSubcommand.java

@@ -56,7 +56,7 @@ protected InteractionCallbackAction<?> handleCommand(@NotNull SlashCommandIntera
 				.build();
 
 		return Modal.create("qotw-add-question", "Create QOTW Question")
-				.addActionRows(ActionRow.of(questionField), ActionRow.of(priorityField))
+				.addComponents(ActionRow.of(questionField), ActionRow.of(priorityField))
 				.build();
 	}
 

src/main/java/net/javadiscord/javabot/systems/staff_commands/embeds/AddEmbedFieldSubcommand.java

@@ -106,7 +106,7 @@ public void handleModal(@NotNull ModalInteractionEvent event, @NotNull List<Moda
 				.setRequired(true)
 				.build();
 		return Modal.create(ComponentIdBuilder.build("embed-addfield", messageId), "Add an Embed Field")
-				.addActionRows(ActionRow.of(titleInput), ActionRow.of(valueInput), ActionRow.of(inlineInput))
+				.addComponents(ActionRow.of(titleInput), ActionRow.of(valueInput), ActionRow.of(inlineInput))
 				.build();
 	}
 

src/main/java/net/javadiscord/javabot/systems/staff_commands/embeds/CreateEmbedSubcommand.java

@@ -114,7 +114,7 @@ public void handleModal(@NotNull ModalInteractionEvent event, @NotNull List<Moda
 				.setRequired(false)
 				.build();
 		return Modal.create(ComponentIdBuilder.build("embed-create", channel.getIdLong()), "Create an Embed Message")
-				.addActionRows(ActionRow.of(titleInput), ActionRow.of(descriptionInput), ActionRow.of(colorInput), ActionRow.of(imageInput))
+				.addComponents(ActionRow.of(titleInput), ActionRow.of(descriptionInput), ActionRow.of(colorInput), ActionRow.of(imageInput))
 				.build();
 	}
 

src/main/java/net/javadiscord/javabot/systems/staff_commands/embeds/EditEmbedSubcommand.java

@@ -170,7 +170,7 @@ public void handleModal(@NotNull ModalInteractionEvent event, @NotNull List<Moda
 				.setRequired(false)
 				.build();
 		return Modal.create(ComponentIdBuilder.build(EDIT_EMBED_ID, AUTHOR_ID, messageId), "Edit Author")
-				.addActionRows(ActionRow.of(authorNameInput), ActionRow.of(authorUrlInput), ActionRow.of(authorIconUrlInput))
+				.addComponents(ActionRow.of(authorNameInput), ActionRow.of(authorUrlInput), ActionRow.of(authorIconUrlInput))
 				.build();
 	}
 
@@ -199,7 +199,7 @@ public void handleModal(@NotNull ModalInteractionEvent event, @NotNull List<Moda
 				.setRequired(false)
 				.build();
 		return Modal.create(ComponentIdBuilder.build(EDIT_EMBED_ID, TITLE_DESC_COLOR_ID, messageId), "Edit Title, Title URL, Description & Color")
-				.addActionRows(ActionRow.of(titleInput), ActionRow.of(titleUrlInput), ActionRow.of(descriptionInput), ActionRow.of(colorInput))
+				.addComponents(ActionRow.of(titleInput), ActionRow.of(titleUrlInput), ActionRow.of(descriptionInput), ActionRow.of(colorInput))
 				.build();
 	}
 
@@ -217,7 +217,7 @@ public void handleModal(@NotNull ModalInteractionEvent event, @NotNull List<Moda
 				.setRequired(false)
 				.build();
 		return Modal.create(ComponentIdBuilder.build(EDIT_EMBED_ID, IMG_THUMB_ID, messageId), "Edit Image & Thumbnail")
-				.addActionRows(ActionRow.of(imageUrlInput), ActionRow.of(thumbnailUrlInput))
+				.addComponents(ActionRow.of(imageUrlInput), ActionRow.of(thumbnailUrlInput))
 				.build();
 	}
 
@@ -241,7 +241,7 @@ public void handleModal(@NotNull ModalInteractionEvent event, @NotNull List<Moda
 				.setRequired(false)
 				.build();
 		return Modal.create(ComponentIdBuilder.build(EDIT_EMBED_ID, FOOTER_TIMESTAMP_ID, messageId), "Edit Footer & Timestamp")
-				.addActionRows(ActionRow.of(footerTextInput), ActionRow.of(footerIconUrlInput), ActionRow.of(timestampInput))
+				.addComponents(ActionRow.of(footerTextInput), ActionRow.of(footerIconUrlInput), ActionRow.of(timestampInput))
 				.build();
 	}
 

src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/SelfRoleInteractionManager.java

@@ -103,7 +103,7 @@ private void buildStaffApplication(@NotNull ButtonInteractionEvent event, Role r
 				.setMaxLength(MessageEmbed.VALUE_MAX_LENGTH)
 				.build();
 		Modal modal = Modal.create(String.format("self-role:staff:%s:%s", role.getId(), applicant.getId()), "Apply for " + role.getName())
-				.addActionRows(ActionRow.of(name), ActionRow.of(age), ActionRow.of(email), ActionRow.of(timezone), ActionRow.of(extraRemarks))
+				.addComponents(ActionRow.of(name), ActionRow.of(age), ActionRow.of(email), ActionRow.of(timezone), ActionRow.of(extraRemarks))
 				.build();
 		event.replyModal(modal).queue();
 	}
@@ -136,7 +136,7 @@ private void buildExpertApplication(@NotNull ButtonInteractionEvent event, @NotN
 				.setRequired(true)
 				.build();
 		Modal modal = Modal.create(String.format("self-role:expert:%s", applicant.getId()), "Apply for " + role.getName())
-				.addActionRows(ActionRow.of(experience), ActionRow.of(projectInfo), ActionRow.of(projectLinks), ActionRow.of(reason))
+				.addComponents(ActionRow.of(experience), ActionRow.of(projectInfo), ActionRow.of(projectLinks), ActionRow.of(reason))
 				.build();
 		event.replyModal(modal).queue();
 	}

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/CustomTagManager.java

@@ -18,7 +18,6 @@
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
-import javax.sql.DataSource;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -37,7 +36,6 @@ public class CustomTagManager {
 		LOADED_TAGS = new HashMap<>();
 	}
 
-	private final DataSource dataSource;
 	private final CustomTagRepository customTagRepository;
 
 	/**

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CreateCustomTagSubcommand.java

@@ -80,7 +80,7 @@ public InteractionCallbackAction<Void> handleCustomTagsSubcommand(@NotNull Slash
 				.setRequired(true)
 				.build();
 		return Modal.create("tag-create", "Create Custom Tag")
-				.addActionRows(ActionRow.of(nameField), ActionRow.of(responseField), ActionRow.of(replyField), ActionRow.of(embedField))
+				.addComponents(ActionRow.of(nameField), ActionRow.of(responseField), ActionRow.of(replyField), ActionRow.of(embedField))
 				.build();
 	}