Merge branch 'dev' into prod

Author: TheEpicBlock

botfest/src/main/kotlin/net/modfest/botfest/App.kt

@@ -51,6 +51,7 @@ suspend fun main() {
 			add(::UserCommands)
 			add(::EventCommands)
 			add(::RoleManager)
+			add(::SubmissionCommands)
 		}
 
 		errorResponse { message, type ->

botfest/src/main/kotlin/net/modfest/botfest/Platform.kt

@@ -12,14 +12,15 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.gson.*
-import io.ktor.util.logging.*
 import net.modfest.platform.gson.GsonCommon
 import net.modfest.platform.pojo.CurrentEventData
 import net.modfest.platform.pojo.EventData
 import net.modfest.platform.pojo.HealthData
 import net.modfest.platform.pojo.PlatformErrorResponse
 import net.modfest.platform.pojo.SubmissionData
-import net.modfest.platform.pojo.SubmitRequest
+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
@@ -106,6 +107,10 @@ class Platform(baseUrl: String) {
 		return getEvents().map { e -> e.id }
 	}
 
+	suspend fun getUserSubmissions(user: Snowflake): List<SubmissionData> {
+		return client.get("/user/dc:${user.value}/submissions").unwrapErrors().body()
+	}
+
 	/**
 	 * Retrieve a user by their discord id. Will be null if the user does not exist
 	 */
@@ -165,12 +170,26 @@ class PlatformAuthenticated(var client: HttpClient, var discordUser: Snowflake)
 	}
 
 	suspend fun submitModrinth(eventId: String, mrId: String): SubmissionData {
-		return client.post("/event/$eventId/submissions") {
+		return client.post("/event/$eventId/submissions?type=modrinth") {
 			addAuth()
-			setBody(SubmitRequest(mrId))
+			setBody(SubmitRequestModrinth(mrId))
 		}.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()
+			setBody(edit)
+		}
+	}
+
 	suspend fun registerMe(event: EventData) {
 		client.put("/event/"+event.id+"/registrations/dc:"+discordUser.value) {
 			addAuth()

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

@@ -28,7 +28,7 @@ class DebugCommands : Extension(), KordExKoinComponent {
 			name = Translations.Commands.Group.Debug.name
 			description = Translations.Commands.Group.Debug.description
 
-			guild(MAIN_GUILD_ID)  // Otherwise it will take up to an hour to update
+			guild(MAIN_GUILD_ID) // Otherwise it will take up to an hour to update
 
 			// View health of the bot and platform
 			ephemeralSubCommand {

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

@@ -2,6 +2,7 @@ package net.modfest.botfest.extensions
 
 import dev.kord.core.behavior.interaction.response.edit
 import dev.kordex.core.commands.application.slash.ephemeralSubCommand
+import dev.kordex.core.commands.application.slash.group
 import dev.kordex.core.components.forms.ModalForm
 import dev.kordex.core.extensions.Extension
 import dev.kordex.core.extensions.ephemeralSlashCommand
@@ -15,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.*
@@ -31,12 +33,11 @@ class EventCommands : Extension(), KordExKoinComponent {
 
 	@OptIn(UnsafeAPI::class)
 	override suspend fun setup() {
-		val platform = bot.getKoin().get<Platform>()
-
 		// Register command
 		unsafeSlashCommand {
 			name = Translations.Commands.Register.name
 			description = Translations.Commands.Register.description
+			guild(MAIN_GUILD_ID)
 
 			// We're using KordEx's unsafe api here, because our modal is optional and has prefilled fields.
 			// This means we're responsible for initiating the response
@@ -160,49 +161,94 @@ class EventCommands : Extension(), KordExKoinComponent {
 				}
 			}
 
-			// command for submitting a mod
-			ephemeralSubCommand(::SubmitModal) {
-				name = Translations.Commands.Event.Submit.name
+
+			// commands for submitting
+			group(Translations.Commands.Event.Submit.name) {
 				description = Translations.Commands.Event.Submit.description
 
-				action { modal ->
-					if (modal == null) return@action
-					val curEvent = platform.getCurrentEvent().event
+				// Submitting a modrinth project
+				ephemeralSubCommand(::SubmitModalModrinth) {
+					name = Translations.Commands.Event.Submit.Modrinth.name
+					description = Translations.Commands.Event.Submit.Modrinth.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
+						}
 
-					if (curEvent == null) {
-						respond {
-							content = Translations.Commands.Event.Submit.Response.unavailable
-								.withContext(this@action)
-								.translateNamed()
+						val matcher = MODRINTH_REGEX.matcher(modal.modrinthUrl.value!!)
+
+						if (!matcher.find()) {
+							respond {
+								content = Translations.Commands.Event.Submit.Response.invalid
+									.withContext(this@action)
+									.translateNamed(
+										"url" to modal.modrinthUrl.value
+									)
+							}
+							return@action
 						}
-						return@action
-					}
 
-					val matcher = MODRINTH_REGEX.matcher(modal.modrinthUrl.value!!)
+						val projectSlug = matcher.group(1)
+
+						val eventInfo = platform.getEvent(curEvent)
+						val submission = platform.withAuth(this.user).submitModrinth(curEvent, projectSlug)
 
-					if (!matcher.find()) {
 						respond {
-							content = Translations.Commands.Event.Submit.Response.invalid
+							content = Translations.Commands.Event.Submit.Response.success
 								.withContext(this@action)
 								.translateNamed(
-									"url" to modal.modrinthUrl.value
+									"event" to eventInfo.name,
+									"mod" to submission.name
 								)
 						}
-						return@action
 					}
+				}
 
-					val projectSlug = matcher.group(1)
+				// 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 eventInfo = platform.getEvent(curEvent)
-					val submission = platform.withAuth(this.user).submitModrinth(curEvent, projectSlug)
+						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
-							)
+						respond {
+							content = Translations.Commands.Event.Submit.Response.success
+								.withContext(this@action)
+								.translateNamed(
+									"event" to eventInfo.name,
+									"mod" to submission.name
+								)
+						}
 					}
 				}
 			}
@@ -239,7 +285,7 @@ class EventCommands : Extension(), KordExKoinComponent {
 
 
 
-	class SubmitModal : ModalForm() {
+	class SubmitModalModrinth : ModalForm() {
 		override var title: Key = Translations.Modal.Submit.title
 
 		val modrinthUrl = lineText {
@@ -250,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 }
 }