Resolve TODO comments in forms feature classes

Author: Defective4

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

@@ -10,6 +10,7 @@
 import java.util.Optional;
 import java.util.TimeZone;
 import java.util.function.Function;
+
 import lombok.RequiredArgsConstructor;
 import net.discordjug.javabot.annotations.AutoDetectableComponentHandler;
 import net.discordjug.javabot.systems.staff_commands.forms.dao.FormsRepository;
@@ -155,9 +156,7 @@ public void handleModal(ModalInteractionEvent event, List<ModalMapping> values)
 			formsRepo.addSubmission(event.getUser(), form, msg);
 		});
 
-		event.getHook()
-				.sendMessage(form.submitMessage() == null ? "Your submission was received!" : form.submitMessage())
-				.queue();
+		event.getHook().sendMessage(form.getOptionalSubmitMessage().orElse("Your submission was received!")).queue();
 	}
 
 	/**

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

@@ -111,8 +111,7 @@ private EmbedBuilder createFormDetailsEmbed(FormData form, Guild guild) {
 
 		builder.addField("Submissions channel", submissionsChannelMention, true);
 		builder.addField("Is one-time", form.onetime() ? ":white_check_mark:" : ":x:", true);
-		addCodeblockField(builder, "Submission message",
-				form.submitMessage() == null ? "Default" : form.submitMessage(), true);
+		addCodeblockField(builder, "Submission message", form.getOptionalSubmitMessage().orElse("Default"), true);
 
 		addCodeblockField(builder, "Number of fields", form.fields().size(), true);
 		addCodeblockField(builder, "Number of submissions", formsRepo.getTotalSubmissionsCount(form), true);

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

@@ -1,5 +1,6 @@
 package net.discordjug.javabot.systems.staff_commands.forms.commands;
 
+import net.dv8tion.jda.api.interactions.InteractionContextType;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;
@@ -34,8 +35,7 @@ public FormCommand(CreateFormSubcommand createSub, DeleteFormSubcommand deleteSu
 			AttachFormSubcommand attachSub, DetachFormSubcommand detachSub,
 			SubmissionsExportFormSubcommand submissionsGetSub, SubmissionsDeleteFormSubcommand submissionsDeleteSub) {
 		setCommandData(Commands.slash("form", "Commands for managing modal forms")
-				.setDefaultPermissions(DefaultMemberPermissions.DISABLED)); // TODO check for an option to make the
-																			// command guild only
+				.setContexts(InteractionContextType.GUILD).setDefaultPermissions(DefaultMemberPermissions.DISABLED));
 		addSubcommands(createSub, deleteSub, closeSub, reopenSub, detailsSub, modifySub, addFieldSub, removeFieldSub,
 				showSub, attachSub, detachSub, submissionsGetSub, submissionsDeleteSub);
 	}

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

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+
 import net.discordjug.javabot.systems.staff_commands.forms.FormInteractionManager;
 import net.dv8tion.jda.api.components.label.Label;
 
@@ -33,7 +34,6 @@
  * @param onetime        onetime state of this form. If it's true, the form only
  *                       accepts one submission per user.
  */
-// TODO `Optional` getter for the submit message
 public record FormData(long id, List<FormField> fields, String title, long submitChannel, String submitMessage,
 		Long messageId, Long messageChannel, Instant expiration, boolean closed, boolean onetime) {
 
@@ -48,6 +48,19 @@ public record FormData(long id, List<FormField> fields, String title, long submi
 		}
 	}
 
+	/**
+	 * Get this form's submit message as an {@link Optional}. If the message is null
+	 * or blank, the returned optional will be empty.
+	 * 
+	 * @return optional submit message
+	 */
+	public Optional<String> getOptionalSubmitMessage() {
+		if (submitMessage == null || submitMessage.isBlank()) {
+			return Optional.empty();
+		}
+		return Optional.of(submitMessage);
+	}
+
 	/**
 	 * Get information about the form's attachment state. If the form is attached to
 	 * a message, this method will return a non-empty optional containin information
@@ -106,7 +119,6 @@ public String toString() {
 		} else if (hasExpired()) {
 			prefix = "Expired";
 		} else {
-			// TODO change how date and time is formatted
 			prefix = FormInteractionManager.DATE_FORMAT.format(new Date(expiration.toEpochMilli())) + " UTC";
 		}