Merge branch 'dev' into webhooks

Author: Tomate0613

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

@@ -37,6 +37,7 @@ import kotlinx.serialization.json.putJsonArray
 import net.modfest.botfest.MAIN_GUILD_ID
 import net.modfest.botfest.Platform
 import net.modfest.botfest.i18n.Translations
+import net.modfest.platform.pojo.EventData
 import net.modfest.platform.pojo.SubmissionData.AssociatedData.Modrinth
 import net.modfest.platform.pojo.SubmissionData.AssociatedData.Other
 import net.modfest.platform.pojo.SubmissionData.BoothData
@@ -632,7 +633,50 @@ class SubmissionCommands : Extension(), KordExKoinComponent {
 				description = Translations.Commands.Submission.Test.description
 
 				action {
-					imageCommandAction("test")
+					val subId = this.arguments.submission
+					val curEvent = platform.getCurrentEvent().event
+					if (curEvent == null) {
+						respond {
+							content = Translations.Commands.Submit.Response.unavailable
+								.withContext(this@action)
+								.translateNamed()
+						}
+						return@action
+					}
+
+					val event = platform.getEvent(curEvent)
+
+					if (event.phase in setOf(EventData.Phase.PLANNING, EventData.Phase.MODDING)) {
+						respond {
+							content = Translations.Commands.Submission.Test.Response.early
+								.withContext(this@action)
+								.translateNamed()
+						}
+						return@action
+					}
+
+					val submission = platform.getEventSubmissions(curEvent).find { it.id == subId }
+
+					if (submission == null) {
+						respond {
+							content = Translations.Commands.Submission.Edit.Response.notfound
+								.withContext(this@action)
+								.translateNamed(
+									"subId" to subId
+								)
+						}
+						return@action
+					}
+
+					platform.withAuth(this.user).editSubmissionImage(curEvent, subId, "test", this.arguments.image.url)
+
+					respond {
+						content = Translations.Commands.Submission.Test.Response.success
+							.withContext(this@action)
+							.translateNamed(
+								"subId" to subId
+							)
+					}
 				}
 			}
 
@@ -652,6 +696,17 @@ class SubmissionCommands : Extension(), KordExKoinComponent {
 						return@action
 					}
 
+					val event = platform.getEvent(curEvent)
+
+					if (event.phase in setOf(EventData.Phase.PLANNING, EventData.Phase.MODDING)) {
+						respond {
+							content = Translations.Commands.Submission.Claim.Response.early
+								.withContext(this@action)
+								.translateNamed()
+						}
+						return@action
+					}
+
 					val submission = platform.getEventSubmissions(curEvent).find { it.id == subId }
 
 					if (submission == null) {
@@ -751,6 +806,17 @@ class SubmissionCommands : Extension(), KordExKoinComponent {
 						return@action
 					}
 
+					val event = platform.getEvent(curEvent)
+
+					if (event.phase in setOf(EventData.Phase.PLANNING, EventData.Phase.MODDING, EventData.Phase.TESTING)) {
+						respond {
+							content = Translations.Commands.Submission.Build.Response.early
+								.withContext(this@action)
+								.translateNamed()
+						}
+						return@action
+					}
+
 					val submission = platform.getEventSubmissions(curEvent).find { it.id == subId }
 
 					if (submission == null) {

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

@@ -122,14 +122,18 @@ commands.submission.invite.response.usernotfound=Unknown user {userId}
 commands.submission.invite.response.already=User {userId} is already associated with {subId}!
 commands.submission.invite.response.success=Successfully added user {userId} to {subId}
 commands.submission.test.name=test
-commands.submission.test.description=Submit or update your test lot
+commands.submission.test.description=Submit or update your testing phase screenshot ("test lot")
+commands.submission.test.response.early=The testing phase hasn't started yet! Test lots must be created on the event test server to check for incompatibilities.
+commands.submission.test.response.success=Updated {subId} with new proof of testing!
 commands.submission.claim.name=claim
 commands.submission.claim.description=Submit or update your booth claim
+commands.submission.claim.response.early=The claiming phase hasn't started yet! Claims are only valid once they've been built on the build server.
 commands.submission.claim.response.incomplete=Incomplete submission rejected! you must fill ALL arguments when initially submitting your claim.
 commands.submission.claim.response.unchanged=No arguments entered - nothing changed!
 commands.submission.claim.response.success=Updated {subId} with new claim data!
 commands.submission.build.name=build
 commands.submission.build.description=Submit or update your booth build info
+commands.submission.build.response.early=The building phase hasn't started yet! No booth building is permitted before this point.
 commands.submission.build.response.incomplete=Incomplete submission rejected! you must fill ALL arguments when initially submitting your build.
 commands.submission.build.response.unchanged=No arguments entered - nothing changed!
 commands.submission.build.response.success=Updated {subId} with new build data!

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

@@ -26,6 +26,7 @@ public enum Type {
     public enum Phase {
         PLANNING(true, false, false),
         MODDING(true, true, true),
+        TESTING(false, false, true),
         BUILDING(false, false, true),
         SHOWCASE(false, false, false),
         COMPLETE(false, false, false);

panel/src/platform_types.ts

@@ -164,7 +164,7 @@ export interface Whoami {
     permissions: string[];
 }
 
-export type EventData$Phase = "planning" | "modding" | "building" | "showcase" | "complete";
+export type EventData$Phase = "planning" | "modding" | "testing" | "building" | "showcase" | "complete";
 
 export type EventData$Type = "modfest" | "blanketcon";