Use optional for form attachment info

Author: Defective4

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

@@ -16,6 +16,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.ExceptionLogger;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.components.actionrow.ActionRow;
 import net.dv8tion.jda.api.components.actionrow.ActionRowChildComponent;
@@ -76,9 +77,11 @@ public class FormInteractionManager implements ButtonHandler, ModalHandler {
 	public void closeForm(Guild guild, FormData form) {
 		formsRepo.closeForm(form);
 
-		if (form.isAttached()) {
-			TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel().get());
-			formChannel.retrieveMessageById(form.getMessageId().get()).queue(msg -> {
+		form.getAttachmentInfo().ifPresent(info -> {
+			long messageChannelId = info.messageChannelId();
+			long messageId = info.messageId();
+			TextChannel formChannel = guild.getTextChannelById(messageChannelId);
+			formChannel.retrieveMessageById(messageId).queue(msg -> {
 				mapFormMessageButtons(msg, btn -> {
 					String cptId = btn.getCustomId();
 					String[] split = ComponentIdBuilder.split(cptId);
@@ -88,8 +91,8 @@ public void closeForm(Guild guild, FormData form) {
 					}
 					return btn;
 				});
-			}, _ -> {});
-		}
+			}, ExceptionLogger::capture);
+		});
 	}
 
 	@Override
@@ -191,9 +194,11 @@ public void mapFormMessageButtons(Message msg, Function<Button, Button> mapper)
 	public void reopenForm(Guild guild, FormData form) {
 		formsRepo.reopenForm(form);
 
-		if (form.isAttached()) {
-			TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel().get());
-			formChannel.retrieveMessageById(form.getMessageId().get()).queue(msg -> {
+		form.getAttachmentInfo().ifPresent(info -> {
+			long messageChannelId = info.messageChannelId();
+			long messageId = info.messageId();
+			TextChannel formChannel = guild.getTextChannelById(messageChannelId);
+			formChannel.retrieveMessageById(messageId).queue(msg -> {
 				mapFormMessageButtons(msg, btn -> {
 					String cptId = btn.getCustomId();
 					String[] split = ComponentIdBuilder.split(cptId);
@@ -203,8 +208,8 @@ public void reopenForm(Guild guild, FormData form) {
 					}
 					return btn;
 				});
-			}, _ -> {});
-		}
+			}, ExceptionLogger::capture);
+		});
 	}
 
 	/**

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

@@ -75,7 +75,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		}
 		FormData form = formOpt.get();
 
-		if (form.isAttached()) {
+		if (form.getAttachmentInfo().isPresent()) {
 			event.getHook()
 					.sendMessage("The form seems to already be attached to a message. Detach it before continuing.")
 					.queue();

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

@@ -52,7 +52,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		event.deferReply(true).queue();
 		FormData form = formOpt.get();
 
-		if (form.isAttached()) {
+		if (form.getAttachmentInfo().isPresent()) {
 			event.getHook().sendMessage(
 					"This form is attached to a message. Use `details` subcommand to check the message this form is attached to, or `detach` subcommand to detach the message before deleting.")
 					.queue();

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

@@ -62,7 +62,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		}
 		FormData form = formOpt.get();
 
-		if (!form.isAttached()) {
+		if (form.getAttachmentInfo().isEmpty()) {
 			event.getHook().sendMessage("This form doesn't seem to be attached to a message").queue();
 			return;
 		}
@@ -86,30 +86,33 @@ public void handleAutoComplete(CommandAutoCompleteInteractionEvent event, AutoCo
 	 * @param guild guild this form is contained in
 	 */
 	public static void detachFromMessage(FormData form, Guild guild) {
-		if (!form.isAttached()) return;
-		TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel().get());
-		if (formChannel != null) {
-			formChannel.retrieveMessageById(form.getMessageId().get()).queue(msg -> {
-				List<ActionRow> components = msg.getComponents().stream().map(msgComponent -> {
-					ActionRow row = msgComponent.asActionRow();
-					List<ActionRowChildComponentUnion> cpts = row.getComponents().stream().filter(cpt -> {
-						if (cpt instanceof Button btn) {
-							String cptId = btn.getCustomId();
-							String[] split = ComponentIdBuilder.split(cptId);
-							if (split[0].equals(FormInteractionManager.FORM_COMPONENT_ID)) {
-								return !split[1].equals(Long.toString(form.id()));
+		form.getAttachmentInfo().ifPresent(info -> {
+			long messageChannelId = info.messageChannelId();
+			long messageId = info.messageId();
+			TextChannel formChannel = guild.getTextChannelById(messageChannelId);
+			if (formChannel != null) {
+				formChannel.retrieveMessageById(messageId).queue(msg -> {
+					List<ActionRow> components = msg.getComponents().stream().map(msgComponent -> {
+						ActionRow row = msgComponent.asActionRow();
+						List<ActionRowChildComponentUnion> cpts = row.getComponents().stream().filter(cpt -> {
+							if (cpt instanceof Button btn) {
+								String cptId = btn.getCustomId();
+								String[] split = ComponentIdBuilder.split(cptId);
+								if (split[0].equals(FormInteractionManager.FORM_COMPONENT_ID)) {
+									return !split[1].equals(Long.toString(form.id()));
+								}
 							}
+							return true;
+						}).toList();
+						if (cpts.isEmpty()) {
+							return null;
 						}
-						return true;
-					}).toList();
-					if (cpts.isEmpty()) {
-						return null;
-					}
-					return ActionRow.of(cpts);
-				}).filter(Objects::nonNull).toList();
-				msg.editMessageComponents(components).queue();
-			}, e -> ExceptionLogger.capture(e));
-		}
+						return ActionRow.of(cpts);
+					}).filter(Objects::nonNull).toList();
+					msg.editMessageComponents(components).queue();
+				}, ExceptionLogger::capture);
+			}
+		});
 	}
 
 }

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

@@ -4,6 +4,7 @@
 
 import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.systems.staff_commands.forms.dao.FormsRepository;
+import net.discordjug.javabot.systems.staff_commands.forms.model.FormAttachmentInfo;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormData;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Guild;
@@ -15,6 +16,7 @@
 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.utils.MarkdownUtil;
 import net.dv8tion.jda.api.utils.TimeFormat;
 import xyz.dynxsty.dih4jda.interactions.AutoCompletable;
 
@@ -81,16 +83,20 @@ private EmbedBuilder createFormDetailsEmbed(FormData form, Guild guild) {
 
 		String channelMention;
 		String messageLink;
-		if (form.isAttached()) {
-			long channelId = form.getMessageChannel().get();
+		Optional<FormAttachmentInfo> attachmentInfoOptonal = form.getAttachmentInfo();
+
+		channelMention = attachmentInfoOptonal.map(info -> {
+			long channelId = info.messageChannelId();
 			TextChannel channel = guild.getTextChannelById(channelId);
-			channelMention = channel != null ? channel.getAsMention() : "`" + channelId + "`";
-			messageLink = String.format("[Link](https://discord.com/channels/%s/%s/%s)", guild.getId(),
-					form.getMessageChannel().get(), form.getMessageId().get());
-		} else {
-			channelMention = "*Not attached*";
-			messageLink = "*Not attached*";
-		}
+			return channel != null ? channel.getAsMention() : "`" + channelId + "`";
+		}).orElse("*Not attached*");
+
+		messageLink = attachmentInfoOptonal.map(attachmentInfo -> {
+			long messageId = attachmentInfo.messageId();
+			long channelId = attachmentInfo.messageChannelId();
+			return MarkdownUtil.maskedLink("Link",
+					String.format("https://discord.com/channels/%s/%s/%s", guild.getId(), channelId, messageId));
+		}).orElse("*Not attached*");
 
 		String submissionsChannelMention;
 		TextChannel submissionsChannel = guild.getTextChannelById(form.submitChannel());

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

@@ -6,6 +6,7 @@
 import net.discordjug.javabot.data.config.BotConfig;
 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.FormAttachmentInfo;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormData;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -83,9 +84,21 @@ public void execute(SlashCommandInteractionEvent event) {
 
 		boolean onetime = event.getOption("onetime", oldForm.onetime(), OptionMapping::getAsBoolean);
 
-		FormData newForm = new FormData(oldForm.id(), oldForm.fields(), title, submitChannel, submitMessage,
-				oldForm.getMessageId().orElse(null), oldForm.getMessageChannel().orElse(null), expiration,
-				oldForm.closed(), onetime);
+		Long messageId;
+		Long messageChannel;
+
+		Optional<FormAttachmentInfo> infoOptional = oldForm.getAttachmentInfo();
+		if (infoOptional.isPresent()) {
+			FormAttachmentInfo info = infoOptional.get();
+			messageId = info.messageId();
+			messageChannel = info.messageChannelId();
+		} else {
+			messageChannel = null;
+			messageId = null;
+		}
+
+		FormData newForm = new FormData(oldForm.id(), oldForm.fields(), title, submitChannel, submitMessage, messageId,
+				messageChannel, expiration, oldForm.closed(), onetime);
 
 		formsRepo.updateForm(newForm);
 

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

@@ -54,7 +54,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		}
 		FormData form = formOpt.get();
 
-		if (form.isAttached() && form.fields().size() <= 1) {
+		if (form.getAttachmentInfo().isPresent() && form.fields().size() <= 1) {
 			event.getHook().sendMessage(
 					"Can't remove the last field from an attached form. Detach the form before removing the field")
 					.queue();

src/main/java/net/discordjug/javabot/systems/staff_commands/forms/dao/FormsRepository.java

@@ -19,6 +19,7 @@
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import net.discordjug.javabot.systems.staff_commands.forms.model.FormAttachmentInfo;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormData;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormField;
 import net.discordjug.javabot.systems.staff_commands.forms.model.FormUser;
@@ -200,13 +201,16 @@ public boolean hasSubmitted(User user, FormData form) {
 	public void insertForm(@NonNull FormData data) {
 		Objects.requireNonNull(data);
 		jdbcTemplate.update(con -> {
+
+			Optional<FormAttachmentInfo> attachmentInfoOptional = data.getAttachmentInfo();
+
 			PreparedStatement statement = con.prepareStatement(
 					"insert into `forms` (title, submit_message, submit_channel, message_id, message_channel, expiration, onetime) values (?, ?, ?, ?, ?, ?, ?)");
 			statement.setString(1, data.title());
 			statement.setString(2, data.submitMessage());
 			statement.setLong(3, data.submitChannel());
-			statement.setObject(4, data.getMessageId().orElse(null));
-			statement.setObject(5, data.getMessageChannel().orElse(null));
+			statement.setObject(4, attachmentInfoOptional.map(FormAttachmentInfo::messageId).orElse(null));
+			statement.setObject(5, attachmentInfoOptional.map(FormAttachmentInfo::messageChannelId).orElse(null));
 			statement.setTimestamp(6,
 					data.hasExpirationTime() ? new Timestamp(data.expiration().toEpochMilli()) : null);
 			statement.setBoolean(7, data.onetime());

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

@@ -0,0 +1,11 @@
+package net.discordjug.javabot.systems.staff_commands.forms.model;
+
+/**
+ * Contains information about form's attachment state. In other words, if the
+ * form is attached to a message, this records contains the message's and its
+ * channel IDs.
+ * 
+ * @see FormData
+ */
+public record FormAttachmentInfo(long messageId, long messageChannelId) {
+}

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

@@ -49,8 +49,11 @@ public record FormData(long id, List<FormField> fields, String title, long submi
 		}
 	}
 
-	public boolean isAttached() {
-		return messageChannel != null && messageId != null;
+	public Optional<FormAttachmentInfo> getAttachmentInfo() {
+		if (messageChannel != null && messageId != null) {
+			return Optional.of(new FormAttachmentInfo(messageId, messageChannel));
+		}
+		return Optional.empty();
 	}
 
 	/**
@@ -87,14 +90,6 @@ public boolean hasExpired() {
 		return hasExpirationTime() && expiration.isBefore(Instant.now());
 	}
 
-	public Optional<Long> getMessageId() {
-		return Optional.ofNullable(messageId);
-	}
-
-	public Optional<Long> getMessageChannel() {
-		return Optional.ofNullable(messageChannel);
-	}
-
 	@Override
 	public String toString() {
 		String prefix;