Automatically set run time to minimumInGameTimeToAllowBreaks and stor…

…e the save file time
ori-community · Dec 16, 2024 · b78a022 · b78a022
1 parent 73f6881
commit b78a022
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/main/kotlin/wotw/io/messages/protobuf/Messages.kt b/src/main/kotlin/wotw/io/messages/protobuf/Messages.kt
@@ -586,4 +586,5 @@ data class LeagueGameSubmissionRankingData(
     @ProtoNumber(3) @Required val rank: Int? = null,
     @ProtoNumber(5) @Required val videoUrl: String? = null,
     @ProtoNumber(6) val rankingMultiplier: Float,
+    @ProtoNumber(7) @Required val saveFileTime: Float? = null,
 )
diff --git a/src/main/kotlin/wotw/server/api/LeagueEndpoint.kt b/src/main/kotlin/wotw/server/api/LeagueEndpoint.kt
@@ -247,11 +247,13 @@ class LeagueEndpoint(server: WotwBackendServer) : Endpoint(server) {
                 saveFileBuffer.get(saveFileArray)
 
                 val autoValidationErrors = mutableListOf<String>()
+                var timeOverride: Float? = null
 
                 if (
                     saveData.inGameTime < minimumInGameTimeToAllowBreaks &&
                     playerDisconnectedTime > LEAGUE_MAX_DISCONNECTED_TIME
                 ) {
+                    timeOverride = minimumInGameTimeToAllowBreaks
                     autoValidationErrors += """
                         Taking breaks during the run is only allowed after ${floor(minimumInGameTimeToAllowBreaks / 60f)} minutes of in-game time.
                         You were disconnected for $playerDisconnectedTime seconds.
@@ -260,7 +262,9 @@ class LeagueEndpoint(server: WotwBackendServer) : Endpoint(server) {
 
                 newSuspendedTransaction {
                     handler.createSubmission(authenticatedUser()) {
-                        it.time = saveData.inGameTime
+                        it.time = timeOverride ?: saveData.inGameTime
+                        it.saveFileTime = saveData.inGameTime
+
                         it.saveFile = saveFileArray
 
                         if (autoValidationErrors.isNotEmpty()) {

diff --git a/src/main/kotlin/wotw/server/database/model/LeagueGameSubmission.kt b/src/main/kotlin/wotw/server/database/model/LeagueGameSubmission.kt
@@ -15,6 +15,7 @@ object LeagueGameSubmissions : LongIdTable("league_game_submissions") {
     val submittedAt = timestamp("submitted_at").defaultExpression(CurrentTimestamp)
     val saveFile = binary("save_file", 512 * 1024).nullable()
     val time = float("time").nullable()
+    val save_file_time = float("save_file_time").nullable()
     val points = integer("points").default(0)
     val rank = integer("rank").nullable()
     val videoUrl = varchar("video_url", 128).nullable()
@@ -35,6 +36,7 @@ class LeagueGameSubmission(id: EntityID<Long>) : LongEntity(id) {
     var submittedAt by LeagueGameSubmissions.submittedAt
     var saveFile by LeagueGameSubmissions.saveFile
     var time by LeagueGameSubmissions.time
+    var saveFileTime by LeagueGameSubmissions.save_file_time
     var points by LeagueGameSubmissions.points
     var rank by LeagueGameSubmissions.rank
     var videoUrl by LeagueGameSubmissions.videoUrl

diff --git a/src/main/kotlin/wotw/server/services/InfoMessagesService.kt b/src/main/kotlin/wotw/server/services/InfoMessagesService.kt
@@ -158,6 +158,7 @@ class InfoMessagesService(private val server: WotwBackendServer) {
             submission.rank,
             submission.videoUrl,
             submission.rankingMultiplier,
+            submission.saveFileTime,
         )
     )