Store form's message channel and id as longs instead of Strings

Defective4 · Defective4 · commit 2c971722cbad · 2025-09-17T16:21:21.000+02:00
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/FormInteractionManager.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/FormInteractionManager.java
@@ -76,9 +76,9 @@ public class FormInteractionManager implements ButtonHandler, ModalHandler {
 	public void closeForm(Guild guild, FormData form) {
 		formsRepo.closeForm(form);
 
-		if (form.getMessageChannel() != null && form.getMessageId() != null) {
-			TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel());
-			formChannel.retrieveMessageById(form.getMessageId()).queue(msg -> {
+		if (form.isAttached()) {
+			TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel().get());
+			formChannel.retrieveMessageById(form.getMessageId().get()).queue(msg -> {
 				mapFormMessageButtons(msg, btn -> {
 					String cptId = btn.getId();
 					String[] split = ComponentIdBuilder.split(cptId);
@@ -190,9 +190,9 @@ public void mapFormMessageButtons(Message msg, Function<Button, Button> mapper)
 	public void reopenForm(Guild guild, FormData form) {
 		formsRepo.reopenForm(form);
 
-		if (form.getMessageChannel() != null && form.getMessageId() != null) {
-			TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel());
-			formChannel.retrieveMessageById(form.getMessageId()).queue(msg -> {
+		if (form.isAttached()) {
+			TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel().get());
+			formChannel.retrieveMessageById(form.getMessageId().get()).queue(msg -> {
 				mapFormMessageButtons(msg, btn -> {
 					String cptId = btn.getId();
 					String[] split = ComponentIdBuilder.split(cptId);
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/AttachFormSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/AttachFormSubcommand.java
@@ -63,7 +63,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		}
 		FormData form = formOpt.get();
 
-		if (form.getMessageChannel() != null && form.getMessageId() != null) {
+		if (form.isAttached()) {
 			event.getHook()
 					.sendMessage("The form seems to already be attached to a message. Detach it before continuing.")
 					.queue();
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/CreateFormSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/CreateFormSubcommand.java
@@ -52,7 +52,7 @@ public void execute(SlashCommandInteractionEvent event) {
 
 		long formId = System.currentTimeMillis();
 		FormData form = new FormData(formId, List.of(), event.getOption("title", OptionMapping::getAsString),
-				event.getOption("submit-channel", OptionMapping::getAsChannel).getId(),
+				event.getOption("submit-channel", OptionMapping::getAsChannel).getIdLong(),
 				event.getOption("submit-message", null, OptionMapping::getAsString), null, null, expiration, false,
 				event.getOption("onetime", false, OptionMapping::getAsBoolean));
 
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/DeleteFormSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/DeleteFormSubcommand.java
@@ -48,8 +48,9 @@ public void execute(SlashCommandInteractionEvent event) {
 		FormData form = formOpt.get();
 		formsRepo.deleteForm(form);
 
-		if (form.getMessageChannel() != null && form.getMessageId() != null) {
+		if (form.isAttached()) {
 			DetachFormSubcommand.detachFromMessage(form, event.getGuild());
+			// TODO send a warning
 		}
 
 		event.getHook().sendMessage("Form deleted!").queue();
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/DetachFormSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/DetachFormSubcommand.java
@@ -54,7 +54,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		}
 		FormData form = formOpt.get();
 
-		if (form.getMessageChannel() == null && form.getMessageId() == null) {
+		if (!form.isAttached()) {
 			event.getHook().sendMessage("This form doesn't seem to be attached to a message").queue();
 			return;
 		}
@@ -80,8 +80,9 @@ public void handleAutoComplete(CommandAutoCompleteInteractionEvent event, AutoCo
 	 * @param guild guild this form is contained in
 	 */
 	public static void detachFromMessage(FormData form, Guild guild) {
-		TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel());
-		formChannel.retrieveMessageById(form.getMessageId()).queue(msg -> {
+		if(!form.isAttached()) return;
+		TextChannel formChannel = guild.getTextChannelById(form.getMessageChannel().get());
+		formChannel.retrieveMessageById(form.getMessageId().get()).queue(msg -> {
 			List<ActionRow> components = msg.getActionRows().stream().map(row -> {
 				ItemComponent[] cpts = row.getComponents().stream().filter(cpt -> {
 					if (cpt instanceof Button btn) {
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/DetailsFormSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/DetailsFormSubcommand.java
@@ -80,11 +80,10 @@ private EmbedBuilder createFormDetailsEmbed(FormData form, Guild guild) {
 		addCodeblockField(builder, "State", form.isClosed() ? "Closed" : form.hasExpired() ? "Expired" : "Open", false);
 
 		builder.addField("Attached in",
-				form.getMessageChannel() == null ? "*Not attached*" : "<#" + form.getMessageChannel() + ">", true);
+				form.isAttached() ? "<#" + form.getMessageChannel().get() + ">" : "*Not attached*", true);
 		builder.addField("Attached to",
-				form.getMessageChannel() == null || form.getMessageId() == null ? "*Not attached*"
-						: String.format("[Link](https://discord.com/channels/%s/%s/%s)", guild.getId(),
-								form.getMessageChannel(), form.getMessageId()),
+				form.isAttached() ? String.format("[Link](https://discord.com/channels/%s/%s/%s)", guild.getId(),
+						form.getMessageChannel().get(), form.getMessageId().get()) : "*Not attached*",
 				true);
 
 		builder.addField("Submissions channel", "<#" + form.getSubmitChannel() + ">", true);
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/ModifyFormSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/ModifyFormSubcommand.java
@@ -56,8 +56,7 @@ public void execute(SlashCommandInteractionEvent event) {
 		FormData oldForm = formOpt.get();
 
 		String title = event.getOption("title", oldForm.getTitle(), OptionMapping::getAsString);
-		String submitChannel = event.getOption("submit-channel", oldForm.getSubmitChannel(),
-				OptionMapping::getAsString);
+		long submitChannel = event.getOption("submit-channel", oldForm.getSubmitChannel(), OptionMapping::getAsLong);
 		String submitMessage = event.getOption("submit-message", oldForm.getSubmitMessage(),
 				OptionMapping::getAsString);
 		long expiration;
@@ -72,7 +71,8 @@ public void execute(SlashCommandInteractionEvent event) {
 		boolean onetime = event.getOption("onetime", oldForm.isOnetime(), OptionMapping::getAsBoolean);
 
 		FormData newForm = new FormData(oldForm.getId(), oldForm.getFields(), title, submitChannel, submitMessage,
-				oldForm.getMessageId(), oldForm.getMessageChannel(), expiration, oldForm.isClosed(), onetime);
+				oldForm.getMessageId().orElse(null), oldForm.getMessageChannel().orElse(null), expiration,
+				oldForm.isClosed(), onetime);
 
 		formsRepo.updateForm(newForm);
 
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/RemoveFieldFormSubcommand.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/commands/RemoveFieldFormSubcommand.java
@@ -52,7 +52,7 @@ public void execute(SlashCommandInteractionEvent event) {
 			return;
 		}
 
-		if (form.getMessageChannel() != null && form.getMessageId() != null && form.getFields().size() <= 1) {
+		if (form.isAttached() && form.getFields().size() <= 1) {
 			event.getHook().sendMessage(
 					"Can't remove the last field from an attached form. Detach the form before removing the field")
 					.queue();
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/dao/FormsRepository.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/dao/FormsRepository.java
@@ -218,9 +218,9 @@ public PreparedStatement createPreparedStatement(Connection con) throws SQLExcep
 						"insert into `forms` (title, submit_message, submit_channel, message_id, message_channel, expiration, onetime) values (?, ?, ?, ?, ?, ?, ?)");
 				statement.setString(1, data.getTitle());
 				statement.setString(2, data.getSubmitMessage());
-				statement.setString(3, data.getSubmitChannel());
-				statement.setString(4, data.getMessageId());
-				statement.setString(5, data.getMessageChannel());
+				statement.setLong(3, data.getSubmitChannel());
+				statement.setObject(4, data.getMessageId().orElse(null));
+				statement.setObject(5, data.getMessageChannel().orElse(null));
 				statement.setLong(6, data.getExpiration());
 				statement.setBoolean(7, data.isOnetime());
 				return statement;
@@ -281,7 +281,7 @@ public void updateForm(FormData newData) {
 			PreparedStatement statement = con.prepareStatement(
 					"update `forms` set `title` = ?, `submit_channel` = ?, `submit_message` = ?, `expiration` = ?, `onetime` = ? where `form_id` = ?");
 			statement.setString(1, newData.getTitle());
-			statement.setString(2, newData.getSubmitChannel());
+			statement.setLong(2, newData.getSubmitChannel());
 			statement.setString(3, newData.getSubmitMessage());
 			statement.setLong(4, newData.getExpiration());
 			statement.setBoolean(5, newData.isOnetime());
@@ -296,9 +296,13 @@ private List<FormField> readFormFields(long formId) {
 	}
 
 	private static FormData read(ResultSet rs, List<FormField> fields) throws SQLException {
-		return new FormData(rs.getLong("form_id"), fields, rs.getString("title"), rs.getString("submit_channel"),
-				rs.getString("submit_message"), rs.getString("message_id"), rs.getString("message_channel"),
-				rs.getLong("expiration"), rs.getBoolean("closed"), rs.getBoolean("onetime"));
+		Long messageId = rs.getLong("message_id");
+		if (rs.wasNull()) messageId = null;
+		Long messageChannel = rs.getLong("message_channel");
+		if (rs.wasNull()) messageChannel = null;
+		return new FormData(rs.getLong("form_id"), fields, rs.getString("title"), rs.getLong("submit_channel"),
+				rs.getString("submit_message"), messageId, messageChannel, rs.getLong("expiration"),
+				rs.getBoolean("closed"), rs.getBoolean("onetime"));
 	}
 
 	private static FormField readField(ResultSet rs) throws SQLException {
diff --git a/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/model/FormData.java b/src/main/java/net/discordjug/javabot/systems/staff_commands/forms/model/FormData.java
@@ -4,6 +4,7 @@
 import java.util.Date;
 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.interactions.components.ActionRow;
@@ -24,10 +25,10 @@ public class FormData {
 	private final long expiration;
 	private final List<FormField> fields;
 	private final long id;
-	private final String messageId;
-	private final String messageChannel;
+	private final Long messageId;
+	private final Long messageChannel;
 	private final boolean onetime;
-	private final String submitChannel;
+	private final long submitChannel;
 	private final String submitMessage;
 	private final String title;
 
@@ -56,12 +57,12 @@ public class FormData {
 	 * @param onetime        Whether or not this form accepts one submission per
 	 *                       user.
 	 */
-	public FormData(long id, List<FormField> fields, String title, String submitChannel, String submitMessage,
-			String messageId, String messageChannel, long expiration, boolean closed, boolean onetime) {
+	public FormData(long id, List<FormField> fields, String title, long submitChannel, String submitMessage,
+			Long messageId, Long messageChannel, long expiration, boolean closed, boolean onetime) {
 		this.id = id;
 		this.fields = Objects.requireNonNull(fields);
 		this.title = Objects.requireNonNull(title);
-		this.submitChannel = Objects.requireNonNull(submitChannel);
+		this.submitChannel = submitChannel;
 		this.submitMessage = submitMessage;
 		this.messageId = messageId;
 		this.messageChannel = messageChannel;
@@ -70,6 +71,10 @@ public FormData(long id, List<FormField> fields, String title, String submitChan
 		this.onetime = onetime;
 	}
 
+	public boolean isAttached() {
+		return messageChannel != null && messageId != null;
+	}
+
 	/**
 	 * Creates text components for use in the submission modal.
 	 *
@@ -95,15 +100,15 @@ public long getId() {
 		return id;
 	}
 
-	public String getMessageChannel() {
-		return messageChannel;
+	public Optional<Long> getMessageChannel() {
+		return Optional.ofNullable(messageChannel);
 	}
 
-	public String getMessageId() {
-		return messageId;
+	public Optional<Long> getMessageId() {
+		return Optional.ofNullable(messageId);
 	}
 
-	public String getSubmitChannel() {
+	public long getSubmitChannel() {
 		return submitChannel;
 	}
 
diff --git a/src/main/resources/database/migrations/09-08-2025_forms.sql b/src/main/resources/database/migrations/09-08-2025_forms.sql
@@ -2,9 +2,9 @@ CREATE TABLE forms (
     form_id BIGINT NOT NULL AUTO_INCREMENT,
     title VARCHAR NOT NULL,
     submit_message VARCHAR DEFAULT NULL,
-    submit_channel VARCHAR NOT NULL,
-    message_id VARCHAR DEFAULT NULL,
-    message_channel VARCHAR DEFAULT NULL,
+    submit_channel BIGINT NOT NULL,
+    message_id BIGINT DEFAULT NULL,
+    message_channel BIGINT DEFAULT NULL,
     expiration BIGINT NOT NULL DEFAULT -1,
     closed BOOLEAN NOT NULL DEFAULT FALSE,
     onetime BOOLEAN NOT NULL DEFAULT FALSE,

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void execute(SlashCommandInteractionEvent event) {`
`63`	`63`	`}`
`64`	`64`	`FormData form = formOpt.get();`
`65`	`65`
`66`		`- if (form.getMessageChannel() != null && form.getMessageId() != null) {`
	`66`	`+ if (form.isAttached()) {`
`67`	`67`	`event.getHook()`
`68`	`68`	`.sendMessage("The form seems to already be attached to a message. Detach it before continuing.")`
`69`	`69`	`.queue();`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,9 @@ public void execute(SlashCommandInteractionEvent event) {`
`48`	`48`	`FormData form = formOpt.get();`
`49`	`49`	`formsRepo.deleteForm(form);`
`50`	`50`
`51`		`- if (form.getMessageChannel() != null && form.getMessageId() != null) {`
	`51`	`+ if (form.isAttached()) {`
`52`	`52`	`DetachFormSubcommand.detachFromMessage(form, event.getGuild());`
	`53`	`+ // TODO send a warning`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`event.getHook().sendMessage("Form deleted!").queue();`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void execute(SlashCommandInteractionEvent event) {`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`
`55`		`- if (form.getMessageChannel() != null && form.getMessageId() != null && form.getFields().size() <= 1) {`
	`55`	`+ if (form.isAttached() && form.getFields().size() <= 1) {`
`56`	`56`	`event.getHook().sendMessage(`
`57`	`57`	`"Can't remove the last field from an attached form. Detach the form before removing the field")`
`58`	`58`	`.queue();`