Merge branch 'prod' of github.com:ModFest/platform into prod

Author: TheEpicBlock

botfest/src/main/kotlin/net/modfest/botfest/extensions/SubmissionCommands.kt

@@ -271,19 +271,14 @@ class SubmissionCommands : Extension(), KordExKoinComponent {
 						modal.source.initialValue = submission.source!!.toKey(Locale.UK)
 					}
 
-					val result = modal.sendAndDeferEphemeral(this)
-
-					// Result will be null if the user didn't enter anything
-					// or if the modal timed out
-					if (result == null) {
-						return@action
-					}
+					val result = modal.sendAndDeferEphemeral(this) ?: return@action
 
 					platform.withAuth(this.user).editSubmissionData(curEvent, subId, SubmissionPatchData(
 						modal.name.value,
 						modal.description.value,
 						modal.source.value,
-						if (modal is SubmissionEditOtherForm) { modal.homepage.value } else { null }
+						if (modal is SubmissionEditOtherForm) { modal.homepage.value } else { null },
+						null
 					))
 
 					result.edit {
@@ -375,28 +370,49 @@ class SubmissionCommands : Extension(), KordExKoinComponent {
 							return@action
 						}
 
-						if (submission.platform.inner !is Modrinth) {
-							ackEphemeral {
-								content = Translations.Commands.Submission.Update.Version.Response.notmodrinth
+						val subPlatformData = submission.platform.inner
+						if (subPlatformData is Other) {
+							val modal = SubmissionUpdateOtherForm()
+							modal.downloadUrl.initialValue = subPlatformData.downloadUrl!!.toKey(Locale.UK)
+
+							val result = modal.sendAndDeferEphemeral(this) ?: return@action
+
+							platform.withAuth(this.user).editSubmissionData(curEvent, subId, SubmissionPatchData(
+								null,
+								null,
+								null,
+								null,
+								modal.downloadUrl.value
+							))
+
+							result.edit {
+								content = Translations.Commands.Submission.Edit.Response.success
 									.withContext(this@action)
 									.translateNamed(
 										"subId" to subId
 									)
 							}
-							return@action
-						}
-
-						platform.withAuth(this.user).updateSubmissionVersion(curEvent, subId)
+						} else if (submission.platform.inner !is Modrinth) {
+								ackEphemeral {
+									content = Translations.Commands.Submission.Update.Version.Response.notmodrinth
+										.withContext(this@action)
+										.translateNamed(
+											"subId" to subId
+										)
+								}
+							} else {
+							platform.withAuth(this.user).updateSubmissionVersion(curEvent, subId)
 
-						val updatedSubmission = platform.getUserSubmissions(this.user.id).find { it.id == subId }
+							val updatedSubmission = platform.getUserSubmissions(this.user.id).find { it.id == subId }
 
-						ackEphemeral {
-							content = Translations.Commands.Submission.Update.Version.Response.success
-								.withContext(this@action)
-								.translateNamed(
-									"subId" to subId,
-									"versionId" to (updatedSubmission?.platform?.inner as Modrinth).versionId
-								)
+							ackEphemeral {
+								content = Translations.Commands.Submission.Update.Version.Response.success
+									.withContext(this@action)
+									.translateNamed(
+										"subId" to subId,
+										"versionId" to (updatedSubmission?.platform?.inner as Modrinth).versionId
+									)
+							}
 						}
 					}
 				}
@@ -746,6 +762,17 @@ class SubmissionCommands : Extension(), KordExKoinComponent {
 		}
 	}
 
+	class SubmissionUpdateOtherForm : ModalForm() {
+		override var title: Key = Translations.Modal.Update.title
+
+		val downloadUrl = lineText {
+			label = Translations.Modal.Submission.Downloadurl.label
+			placeholder = Translations.Modal.Submission.Downloadurl.placeholder
+			maxLength = 128
+			required = false
+		}
+	}
+
 	class SubmitModalModrinth : ModalForm() {
 		override var title: Key = Translations.Modal.Submit.title
 

botfest/src/main/resources/translations/botfest/strings.properties

@@ -88,7 +88,7 @@ commands.submission.edit.description=Edit your submission's data
 commands.submission.edit.response.notfound=Unknown submission {subId}
 commands.submission.edit.response.success=Successfully edited the data for {subId}
 commands.submission.update.version.name=version
-commands.submission.update.version.description=Update modrinth submission to the latest compatible version
+commands.submission.update.version.description=Update the in-pack version of a submission
 commands.submission.update.version.response.notfound=Unknown submission {subId}
 commands.submission.update.version.response.notmodrinth=Can't update a non-modrinth submission!
 commands.submission.update.version.response.success=Successfully updated {subId} to version `{versionId}`
@@ -158,6 +158,7 @@ modal.register.pronouns.placeholder=they/them
 modal.submit.title=Submit a mod
 modal.submit.url.label=Enter your project's Modrinth URL
 modal.submit.url.placeholder=https://modrinth.com/project/slug
+modal.update.title=Update a non-Modrinth mod
 modal.submission.edit.title=Edit your mod's data
 modal.submission.name.label=Name
 modal.submission.name.placeholder=My mod

common/src/main/java/net/modfest/platform/gson/GsonCommon.java

@@ -2,7 +2,6 @@
 
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.GsonBuilder;
-import net.modfest.platform.pojo.EventData;
 import net.modfest.platform.pojo.SubmissionData;
 
 import java.time.Instant;
@@ -16,7 +15,6 @@ public static void configureGson(GsonBuilder builder) {
 			.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
 			.registerTypeHierarchyAdapter(Enum.class, new EnumToLowerCaseJsonConverter())
 			.registerTypeAdapter(Instant.class, new InstantSerializer())
-			.registerTypeAdapter(EventData.DescriptionItem.class, new EventData.DescriptionItem.TypeAdapter())
 			.registerTypeAdapter(SubmissionData.AssociatedData.class, new SubmissionData.AssociatedData.TypeAdapter())
 			.setPrettyPrinting()
 			.serializeNulls()

common/src/main/java/net/modfest/platform/pojo/EventData.java

@@ -1,6 +1,5 @@
 package net.modfest.platform.pojo;
 
-import com.google.gson.*;
 import lombok.With;
 import org.jspecify.annotations.NonNull;
 
@@ -18,8 +17,7 @@ public record EventData(@NonNull String id,
                         @NonNull DiscordRoles discordRoles,
                         @NonNull String mod_loader,
                         @NonNull String minecraft_version,
-                        @NonNull String modpack,
-                        @NonNull List<DescriptionItem<?>> description) implements Data {
+                        @NonNull String modpack) implements Data {
     public enum Type {
         MODFEST,
         BLANKETCON
@@ -64,45 +62,6 @@ public record Colors(String primary, String secondary) {
     public record DiscordRoles(String participant, String award) {
     }
 
-    public record DescriptionItem<T>(T content) {
-        public static final String CONTENT_KEY = "content";
-
-        public record Markdown(String markdown) {
-            public static final String KEY = "markdown";
-        }
-
-        public static class TypeAdapter implements JsonSerializer<DescriptionItem<?>>, JsonDeserializer<DescriptionItem<?>> {
-            public static final String TYPE_KEY = "type";
-
-            @Override
-            public DescriptionItem<?> deserialize(JsonElement json,
-                                                  java.lang.reflect.Type typeOfT,
-                                                  JsonDeserializationContext context) throws JsonParseException {
-                JsonObject jsonObject = json.getAsJsonObject();
-                String type = jsonObject.get(TYPE_KEY).getAsString();
-                JsonElement content = jsonObject.get(CONTENT_KEY);
-
-                return switch (type) {
-                    case Markdown.KEY -> new DescriptionItem<Markdown>(context.deserialize(content, Markdown.class));
-                    default -> throw new JsonParseException("Invalid DescriptionItem type: " + type);
-                };
-            }
-
-            @Override
-            public JsonElement serialize(DescriptionItem<?> src,
-                                         java.lang.reflect.Type typeOfSrc,
-                                         JsonSerializationContext context) {
-                var json = new JsonObject();
-                json.add(TYPE_KEY, new JsonPrimitive(switch (src.content) {
-                    case Markdown ignored -> Markdown.KEY;
-                    default -> throw new IllegalStateException("Unexpected value: " + src);
-                }));
-                json.add(CONTENT_KEY, context.serialize(src.content));
-                return json;
-            }
-        }
-    }
-
     public record DateRange(String name, String description, Phase phase, Instant start, Instant end) {
     }
 }

common/src/main/java/net/modfest/platform/pojo/SubmissionPatchData.java

@@ -9,6 +9,10 @@ public record SubmissionPatchData(
 	/**
 	 * Should not be included if the submission isn't of type "other"
 	 */
-	@Nullable String homepage
+	@Nullable String homepage,
+	/**
+	 * Should not be included if the submission isn't of type "other"
+	 */
+	@Nullable String downloadUrl
 ) {
 }

platform_api/src/main/java/net/modfest/platform/service/SubmissionService.java

@@ -53,6 +53,14 @@ public void editSubmission(SubmissionData data, SubmissionPatchData edit) {
 				throw new IllegalStateException();
 			}
 		}
+		if (edit.downloadUrl() != null) {
+			if (data.platform().inner() instanceof SubmissionData.AssociatedData.Other o) {
+				var newInner = o.withDownloadUrl(edit.downloadUrl().isBlank() ? null : edit.downloadUrl());
+				data = data.withPlatform(new SubmissionData.AssociatedData(newInner));
+			} else {
+				throw new IllegalStateException();
+			}
+		}
 		submissionRepository.save(data);
 	}
 

platform_api/src/test/java/net/modfest/platform/JsonTests.java

@@ -63,10 +63,7 @@ public static List<Object> testObjects() {
 				),
 				"optifine",
 				"1.34",
-				"boop",
-				List.of(
-					new EventData.DescriptionItem<>(new EventData.DescriptionItem.Markdown("# HELLO"))
-				)
+				"boop"
 			),
 			new SubmissionData(
 				"a",