fix: change longest session record type to SessionRecord

Warzone · Jul 14, 2024 · 9fbb7d6 · 9fbb7d6
1 parent 0db1e5e
commit 9fbb7d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/main/kotlin/network/warzone/mars/player/achievements/variants/RecordAchievement.kt b/src/main/kotlin/network/warzone/mars/player/achievements/variants/RecordAchievement.kt
@@ -24,7 +24,7 @@ class RecordAchievement(
         when (params.recordType) {
             RecordType.LONGEST_SESSION -> {
                 val session = records.longestSession
-                val elapsedTime = session?.let { differenceInMinutes(it.createdAt, it.endedAt) }
+                val elapsedTime = session?.let { differenceInMinutes(it.length) }
                 if ((elapsedTime ?: 0L) >= params.threshold.toLong()) {
                     emitter.emit(event.update.updated.name)
                 }
@@ -69,11 +69,6 @@ class RecordAchievement(
     }
 }
 
-private fun differenceInMinutes(start: Date, end: Date?): Long {
-    if (end == null) return 0L
-
-    val differenceInMillis = end.time - start.time
-    return TimeUnit.MILLISECONDS.toMinutes(differenceInMillis)
+private fun differenceInMinutes(millis: Long): Long {
+    return TimeUnit.MILLISECONDS.toMinutes(millis)
 }
-
-
diff --git a/src/main/kotlin/network/warzone/mars/player/models/PlayerProfile.kt b/src/main/kotlin/network/warzone/mars/player/models/PlayerProfile.kt
@@ -157,7 +157,7 @@ data class PlayerStats(
 
 data class PlayerRecords(
 //    var highestKillstreak: Int = 0, -- this can be calculated from profile
-    var longestSession: Session? = null,
+    var longestSession: SessionRecord? = null,
 //    var longestProjectileHit: ProjectileRecord? = null,
     var longestProjectileKill: ProjectileRecord? = null,
     var fastestWoolCapture: LongRecord? = null,
@@ -167,6 +167,8 @@ data class PlayerRecords(
     var deathsInMatch: IntRecord? = null,
 )
 
+data class SessionRecord(val sessionId: String, val length: Long)
+
 data class ProjectileRecord(val matchId: String, val distance: Int)
 
 data class FirstBloodRecord(val matchId: String, val victim: SimplePlayer, val time: Long)