Use DateTimeFormatter in forms

Author: Defective4

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/FormInteractionManager.java

@@ -1,14 +1,13 @@
 package net.discordjug.javabot.systems.staff_commands.forms;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.List;
-import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.TimeZone;
 import java.util.function.Function;
 
 import lombok.RequiredArgsConstructor;
@@ -45,14 +44,14 @@
 public class FormInteractionManager implements ButtonHandler, ModalHandler {
 
 	/**
-	 * Date and time format used in forms.
+	 * String representation of the date and time format used in forms.
 	 */
-	public static final DateFormat DATE_FORMAT;
+	public static final String DATE_FORMAT_STRING = "dd/MM/yyyy HH:mm";
 
 	/**
-	 * String representation of the date and time format used in forms.
+	 * Date and time formatter used in forms.
 	 */
-	public static final String DATE_FORMAT_STRING;
+	public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT_STRING);
 
 	/**
 	 * Component ID used for form buttons and modals.
@@ -62,12 +61,6 @@ public class FormInteractionManager implements ButtonHandler, ModalHandler {
 
 	private final FormsRepository formsRepo;
 
-	static {
-		DATE_FORMAT_STRING = "dd/MM/yyyy HH:mm";
-		DATE_FORMAT = new SimpleDateFormat(FormInteractionManager.DATE_FORMAT_STRING, Locale.ENGLISH);
-		DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
-	}
-
 	/**
 	 * Closes the form, preventing further submissions and disabling associated
 	 * buttons from a message this form is attached to, if any.
@@ -239,8 +232,8 @@ public static Optional<Instant> parseExpiration(SlashCommandInteractionEvent eve
 			expiration = Optional.empty();
 		} else {
 			try {
-				expiration = Optional.of(FormInteractionManager.DATE_FORMAT.parse(expirationStr).toInstant());
-			} catch (ParseException e) {
+				expiration = Optional.of(LocalDateTime.parse(expirationStr, DATE_FORMATTER).toInstant(ZoneOffset.UTC));
+			} catch (DateTimeParseException e) {
 				throw new IllegalArgumentException("Invalid date. You should follow the format `"
 						+ FormInteractionManager.DATE_FORMAT_STRING + "`.");
 			}

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/AddFieldFormSubcommand.java

@@ -7,6 +7,7 @@
 import net.discordjug.javabot.systems.staff_commands.forms.dao.FormsRepository;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormData;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormField;
+import net.discordjug.javabot.util.Responses;
 import net.dv8tion.jda.api.components.textinput.TextInputStyle;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
@@ -17,14 +18,15 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.dv8tion.jda.api.modals.Modal;
 import xyz.dynxsty.dih4jda.interactions.AutoCompletable;
 
 /**
  * The `/form add-field` command. This command allows for modification of
  * {@link FormData} by adding new fields to it. See
  * {@link RemoveFieldFormSubcommand} for the command used to remove fields from
  * a form.<br>
- * Currently, due to Discord limitations, only 5 fields are allowed per form.
+ * Currently, due to Discord limitations, only {@link Modal#MAX_COMPONENTS} fields are allowed per form.
  * Trying to add more fields will have no effect.
  * 
  * @see FormData
@@ -57,32 +59,29 @@ public AddFieldFormSubcommand(FormsRepository formsRepo, BotConfig botConfig) {
 				.addOption(OptionType.STRING, FORM_PLACEHOLDER_FIELD, "Field placeholder")
 				.addOption(OptionType.BOOLEAN, FORM_REQUIRED_FIELD,
 						"Whether or not the user has to input data in this field. Default: false")
-				.addOptions(
-						new OptionData(OptionType.STRING, FORM_STYLE_FIELD, "Input style. Default: SHORT", false)
-								.addChoices(
-										Arrays.stream(TextInputStyle.values()).filter(t -> t != TextInputStyle.UNKNOWN)
-												.map(style -> new Choice(style.name(), style.name())).toList()))
+				.addOptions(new OptionData(OptionType.STRING, FORM_STYLE_FIELD, "Input style. Default: SHORT", false)
+						.addChoices(Arrays.stream(TextInputStyle.values()).filter(t -> t != TextInputStyle.UNKNOWN)
+								.map(style -> new Choice(style.name(), style.name())).toList()))
 				.addOption(OptionType.STRING, FORM_VALUE_FIELD, "Initial field value"));
 	}
 
 	@Override
 	public void execute(SlashCommandInteractionEvent event) {
 		if (!checkForStaffRole(event)) return;
-		event.deferReply(true).queue();
 		Optional<FormData> formOpt = formsRepo.getForm(event.getOption(FORM_ID_FIELD, OptionMapping::getAsLong));
 		if (formOpt.isEmpty()) {
-			event.getHook().sendMessage("A form with this ID was not found.").queue();
+			Responses.error(event, "A form with this ID was not found.").queue();
 			return;
 		}
 		FormData form = formOpt.get();
 
 		if (form.fields().size() >= Message.MAX_COMPONENT_COUNT) {
-			event.getHook().sendMessage("Can't add more than 5 components to a form").queue();
+			Responses.error(event, "Can't add more than %s components to a form", Message.MAX_COMPONENT_COUNT).queue();
 			return;
 		}
 
 		formsRepo.addField(form, createFormFieldFromEvent(event));
-		event.getHook().sendMessage("Added a new field to the form.").queue();
+		event.reply("Added a new field to the form.").setEphemeral(true).queue();
 	}
 
 	@Override

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/AttachFormSubcommand.java

@@ -9,6 +9,7 @@
 import net.discordjug.javabot.systems.staff_commands.forms.FormInteractionManager;
 import net.discordjug.javabot.systems.staff_commands.forms.dao.FormsRepository;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormData;
+import net.dv8tion.jda.api.components.Component.Type;
 import net.dv8tion.jda.api.components.MessageTopLevelComponentUnion;
 import net.dv8tion.jda.api.components.actionrow.ActionRow;
 import net.dv8tion.jda.api.components.actionrow.ActionRowChildComponent;
@@ -140,7 +141,8 @@ private static void attachFormToMessage(Message message, String buttonLabel, But
 			button = button.asDisabled();
 		}
 
-		if (rows.isEmpty() || rows.get(rows.size() - 1).getActionComponents().size() >= 5) {
+		if (rows.isEmpty()
+				|| rows.get(rows.size() - 1).getActionComponents().size() >= ActionRow.getMaxAllowed(Type.BUTTON)) {
 			rows.add(ActionRow.of(button));
 		} else {
 			ActionRow lastRow = rows.get(rows.size() - 1);

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/model/FormData.java

@@ -1,9 +1,9 @@
 package net.discordjug.javabot.systems.staff_commands.forms.model;
 
 import java.time.Instant;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -63,8 +63,8 @@ public Optional<String> getOptionalSubmitMessage() {
 
 	/**
 	 * Get information about the form's attachment state. If the form is attached to
-	 * a message, this method will return a non-empty optional containing information
-	 * about the message this form is attached to.
+	 * a message, this method will return a non-empty optional containing
+	 * information about the message this form is attached to.
 	 * 
 	 * @return optional attachment info
 	 */
@@ -119,7 +119,7 @@ public String toString() {
 		} else if (hasExpired()) {
 			prefix = "Expired";
 		} else {
-			prefix = FormInteractionManager.DATE_FORMAT.format(new Date(expiration.toEpochMilli())) + " UTC";
+			prefix = FormInteractionManager.DATE_FORMATTER.format(expiration.atZone(ZoneId.of("UTC"))) + " UTC";
 		}
 
 		return String.format("[%s] %s", prefix, title);