Add non-modrinth submissions

TheEpicBlock · TheEpicBlock · commit 106fffff1e29 · 2025-02-26T23:07:49.000+01:00
Closes #5
diff --git a/botfest/src/main/kotlin/net/modfest/botfest/Platform.kt b/botfest/src/main/kotlin/net/modfest/botfest/Platform.kt
@@ -20,6 +20,7 @@ import net.modfest.platform.pojo.PlatformErrorResponse
 import net.modfest.platform.pojo.SubmissionData
 import net.modfest.platform.pojo.SubmissionPatchData
 import net.modfest.platform.pojo.SubmitRequestModrinth
+import net.modfest.platform.pojo.SubmitRequestOther
 import net.modfest.platform.pojo.UserCreateData
 import net.modfest.platform.pojo.UserData
 import net.modfest.platform.pojo.UserPatchData
@@ -175,6 +176,13 @@ class PlatformAuthenticated(var client: HttpClient, var discordUser: Snowflake)
 		}.unwrapErrors().body()
 	}
 
+	suspend fun submitOther(eventId: String, data: SubmitRequestOther): SubmissionData {
+		return client.post("/event/$eventId/submissions?type=other") {
+			addAuth()
+			setBody(data)
+		}.unwrapErrors().body()
+	}
+
 	suspend fun editSubmissionData(eventId: String, subId: String, edit: SubmissionPatchData) {
 		client.patch("/event/$eventId/submission/$subId") {
 			addAuth()
diff --git a/botfest/src/main/kotlin/net/modfest/botfest/extensions/EventCommands.kt b/botfest/src/main/kotlin/net/modfest/botfest/extensions/EventCommands.kt
@@ -16,6 +16,7 @@ import dev.kordex.modules.dev.unsafe.extensions.unsafeSlashCommand
 import net.modfest.botfest.MAIN_GUILD_ID
 import net.modfest.botfest.Platform
 import net.modfest.botfest.i18n.Translations
+import net.modfest.platform.pojo.SubmitRequestOther
 import net.modfest.platform.pojo.UserCreateData
 import org.koin.core.component.inject
 import java.util.*
@@ -161,10 +162,12 @@ class EventCommands : Extension(), KordExKoinComponent {
 			}
 
 
+			// commands for submitting
 			group(Translations.Commands.Event.Submit.name) {
 				description = Translations.Commands.Event.Submit.description
-				// command for submitting a mod
-				ephemeralSubCommand(::SubmitModrinthModal) {
+
+				// Submitting a modrinth project
+				ephemeralSubCommand(::SubmitModalModrinth) {
 					name = Translations.Commands.Event.Submit.Modrinth.name
 					description = Translations.Commands.Event.Submit.Modrinth.description
 
@@ -209,6 +212,45 @@ class EventCommands : Extension(), KordExKoinComponent {
 						}
 					}
 				}
+
+				// Submitting a non-modrinth project
+				ephemeralSubCommand(::SubmitModalOther) {
+					name = Translations.Commands.Event.Submit.Other.name
+					description = Translations.Commands.Event.Submit.Other.description
+
+					action { modal ->
+						if (modal == null) return@action
+						val curEvent = platform.getCurrentEvent().event
+
+						if (curEvent == null) {
+							respond {
+								content = Translations.Commands.Event.Submit.Response.unavailable
+									.withContext(this@action)
+									.translateNamed()
+							}
+							return@action
+						}
+
+						val submission = platform.withAuth(this.user).submitOther(curEvent, SubmitRequestOther(
+							modal.name.value!!,
+							modal.description.value!!,
+							setOf("dc:"+user.id),
+							modal.homepage.value.convertBlankToNull(),
+							modal.sourcecode.value.convertBlankToNull(),
+							modal.downloadUrl.value.convertBlankToNull()
+						))
+						val eventInfo = platform.getEvent(curEvent)
+
+						respond {
+							content = Translations.Commands.Event.Submit.Response.success
+								.withContext(this@action)
+								.translateNamed(
+									"event" to eventInfo.name,
+									"mod" to submission.name
+								)
+						}
+					}
+				}
 			}
 		}
 	}
@@ -243,7 +285,7 @@ class EventCommands : Extension(), KordExKoinComponent {
 
 
 
-	class SubmitModrinthModal : ModalForm() {
+	class SubmitModalModrinth : ModalForm() {
 		override var title: Key = Translations.Modal.Submit.title
 
 		val modrinthUrl = lineText {
@@ -254,4 +296,49 @@ class EventCommands : Extension(), KordExKoinComponent {
 			required = true
 		}
 	}
+
+	class SubmitModalOther : ModalForm() {
+		override var title: Key = Translations.Modal.Submit.title
+
+		val name = lineText {
+			label = Translations.Modal.Submission.Name.label
+			placeholder = Translations.Modal.Submission.Name.placeholder
+			minLength = 1
+			maxLength = 128
+			required = true
+		}
+
+		val description = lineText {
+			label = Translations.Modal.Submission.Description.label
+			placeholder = Translations.Modal.Submission.Description.placeholder
+			minLength = 1
+			maxLength = 256
+			required = true
+		}
+
+		val homepage = lineText {
+			label = Translations.Modal.Submission.Homepage.label
+			placeholder = Translations.Modal.Submission.Homepage.placeholder
+			maxLength = 128
+			required = false
+		}
+
+		val sourcecode = lineText {
+			label = Translations.Modal.Submission.Source.extendedlabel
+			placeholder = Translations.Modal.Submission.Source.placeholder
+			maxLength = 128
+			required = false
+		}
+
+		val downloadUrl = lineText {
+			label = Translations.Modal.Submission.Downloadurl.label
+			placeholder = Translations.Modal.Submission.Downloadurl.placeholder
+			maxLength = 128
+			required = false
+		}
+	}
+}
+
+private fun String?.convertBlankToNull(): String? {
+	return if (this.isNullOrBlank()) { null } else { this }
 }
diff --git a/botfest/src/main/resources/translations/botfest/strings.properties b/botfest/src/main/resources/translations/botfest/strings.properties
@@ -57,6 +57,8 @@ commands.event.submit.name=submit
 commands.event.submit.description=submit a project
 commands.event.submit.modrinth.name=modrinth
 commands.event.submit.modrinth.description=Submit a modrinth project
+commands.event.submit.other.name=other
+commands.event.submit.other.description=Submit a project
 commands.event.submit.response.invalid=`{url}` is not a valid Modrinth URL
 commands.event.submit.response.unavailable=There's no current event happening.
 commands.event.submit.response.success=Successfully submitted {mod} to {event} :tada:
@@ -98,13 +100,16 @@ modal.submit.url.label=Enter your project's Modrinth URL
 modal.submit.url.placeholder=https://modrinth.com/mod/your-mod
 modal.submission.edit.title=Edit your mod's data
 modal.submission.name.label=Name
-modal.submission.name.placeholder=...
+modal.submission.name.placeholder=My mod
 modal.submission.description.label=Description
-modal.submission.description.placeholder=...
+modal.submission.description.placeholder=A mod for doing stuff and things
 modal.submission.source.label=Sourcecode link
-modal.submission.source.placeholder=...
+modal.submission.source.extendedlabel=A link to your source code (if applicable)
+modal.submission.source.placeholder=https://github.com/...
 modal.submission.homepage.label=Link to your project's homepage
 modal.submission.homepage.placeholder=https://mymod.com/
+modal.submission.downloadurl.label=A download link (if it should be in the pack)
+modal.submission.downloadurl.placeholder=https://github.com/.../.../releases/download/v1.0/mymod.jar
 
 apierror.event_no_exists=An event named {n} doesn't exists
 apierror.user_no_exists=A user named {n} doesn't exists
diff --git a/common/src/main/java/net/modfest/platform/pojo/SubmitRequestOther.java b/common/src/main/java/net/modfest/platform/pojo/SubmitRequestOther.java
@@ -3,9 +3,12 @@
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
+import java.util.Set;
+
 public record SubmitRequestOther(
 	@NonNull String name,
 	@NonNull String description,
+	@NonNull Set<String> authors,
 	@Nullable String homepage,
 	@Nullable String sourceUrl,
 	@Nullable String downloadUrl
diff --git a/platform_api/src/main/java/net/modfest/platform/controller/EventController.java b/platform_api/src/main/java/net/modfest/platform/controller/EventController.java
@@ -1,9 +1,6 @@
 package net.modfest.platform.controller;
 
-import net.modfest.platform.pojo.EventData;
-import net.modfest.platform.pojo.SubmissionData;
-import net.modfest.platform.pojo.SubmissionPatchData;
-import net.modfest.platform.pojo.SubmitRequestModrinth;
+import net.modfest.platform.pojo.*;
 import net.modfest.platform.security.PermissionUtils;
 import net.modfest.platform.security.Permissions;
 import net.modfest.platform.service.EventService;
@@ -18,6 +15,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE)
@@ -87,9 +85,34 @@ public List<SubmissionData> getSubmissions(@PathVariable String eventId) {
 		return service.getSubmissionsFromEvent(event).toList();
 	}
 
-	@PostMapping(value = "/event/{eventId}/submissions", params = "type=modrinth")
+	@PostMapping(value = "/event/{eventId}/submissions", params = "type=other")
 	@RequiresPermissions(Permissions.Event.SUBMIT)
-	public SubmissionData makeSubmission(@PathVariable String eventId, @RequestBody SubmitRequestModrinth submission) {
+	public SubmissionData makeSubmissionOther(@PathVariable String eventId, @RequestBody SubmitRequestOther submission) {
+		var event = getEvent(eventId);
+		var subject = SecurityUtils.getSubject();
+		var bypass = subject.isPermitted(Permissions.Event.SUBMIT_BYPASS);
+		var can_others = subject.isPermitted(Permissions.Event.SUBMIT_OTHER);
+
+		var authors = submission.authors()
+			.stream()
+			.map(id -> userController.getSingleUser(id)).collect(Collectors.toSet());
+		var self = authors.stream().anyMatch(d -> PermissionUtils.owns(subject, d));
+
+		if (!event.phase().canSubmit() && !bypass) {
+			throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Event does not accept submissions");
+		}
+
+		if (!self && !can_others) {
+			throw new ResponseStatusException(HttpStatus.FORBIDDEN,
+				"You don't have permissions to submit for people other than yourself");
+		}
+
+		return service.makeSubmissionOther(event, authors, submission);
+	}
+
+		@PostMapping(value = "/event/{eventId}/submissions", params = "type=modrinth")
+	@RequiresPermissions(Permissions.Event.SUBMIT)
+	public SubmissionData makeSubmissionModrinth(@PathVariable String eventId, @RequestBody SubmitRequestModrinth submission) {
 		var event = getEvent(eventId);
 		var subject = SecurityUtils.getSubject();
 		var bypass = subject.isPermitted(Permissions.Event.SUBMIT_BYPASS);
@@ -111,7 +134,7 @@ public SubmissionData makeSubmission(@PathVariable String eventId, @RequestBody
 				"You don't have permissions to submit for people other than yourself");
 		}
 
-		return service.makeModrinthSubmission(eventId, submission.modrinthProject());
+		return service.makeSubmissionModrinth(eventId, submission.modrinthProject());
 	}
 
 	@PatchMapping("/event/{eventId}/submission/{subId}")
diff --git a/platform_api/src/main/java/net/modfest/platform/service/SubmissionService.java b/platform_api/src/main/java/net/modfest/platform/service/SubmissionService.java
@@ -1,9 +1,6 @@
 package net.modfest.platform.service;
 
-import net.modfest.platform.pojo.EventData;
-import net.modfest.platform.pojo.SubmissionData;
-import net.modfest.platform.pojo.SubmissionPatchData;
-import net.modfest.platform.pojo.UserData;
+import net.modfest.platform.pojo.*;
 import net.modfest.platform.repository.SubmissionRepository;
 import nl.theepicblock.dukerinth.ModrinthApi;
 import nl.theepicblock.dukerinth.VersionFilter;
@@ -15,10 +12,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -93,7 +87,43 @@ public Stream<UserData> getUsersForRinthProject(String modrinthProjectId) {
 			.filter(Objects::nonNull);
 	}
 
-	public SubmissionData makeModrinthSubmission(String eventId, String mrProjectId) {
+	public SubmissionData makeSubmissionOther(EventData event, Set<UserData> authors, SubmitRequestOther submitData) {
+		var subId = submitData.name()
+			.toLowerCase(Locale.ROOT)
+			.replace(" ", "_")
+			.replaceAll("[^a-z0-9_\\-\\s]", "");
+		if (subId.isBlank()) {
+			throw new IllegalStateException();
+		}
+		var idKey = new SubmissionRepository.SubmissionId(event.id(), subId);
+		if (submissionRepository.contains(idKey)) {
+			// TODO friendlier error message for duplicates
+			throw new IllegalStateException();
+		}
+		var submission = new SubmissionData(
+			subId,
+			event.id(),
+			submitData.name(),
+			submitData.description(),
+			authors.stream().map(a -> a.id()).collect(Collectors.toSet()),
+			new SubmissionData.AssociatedData(
+				new SubmissionData.AssociatedData.Other(
+					submitData.homepage(),
+					submitData.downloadUrl()
+				)
+			),
+			new SubmissionData.Images(null, null),
+			submitData.sourceUrl(),
+			new SubmissionData.Awards(
+				Set.of(),
+				Set.of()
+			)
+		);
+		submissionRepository.save(submission);
+		return submission;
+	}
+
+	public SubmissionData makeSubmissionModrinth(String eventId, String mrProjectId) {
 		var project = modrinth.projects().getProject(mrProjectId);
 		var subId = project.slug; // Normalize id by using slug. Just in case the user entered an actual id
 		if (subId == null) subId = project.id;
