From 4cb14c82490c476f43308688865962da276a22ad Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Sat, 9 Apr 2022 13:40:05 -0400 Subject: [PATCH] Refactoring --- src/jvmMain/kotlin/starshipfights/auth/utils.kt | 2 +- src/jvmMain/kotlin/starshipfights/info/views_user.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jvmMain/kotlin/starshipfights/auth/utils.kt b/src/jvmMain/kotlin/starshipfights/auth/utils.kt index 8b934a4..5e8307b 100644 --- a/src/jvmMain/kotlin/starshipfights/auth/utils.kt +++ b/src/jvmMain/kotlin/starshipfights/auth/utils.kt @@ -17,7 +17,7 @@ import java.time.Instant import java.time.temporal.ChronoUnit suspend fun Id.resolve(userAgent: String) = UserSession.get(this)?.takeIf { session -> - session.userAgent == userAgent && session.expiration.isAfter(Instant.now()) + session.userAgent == userAgent && session.expiration > Instant.now() } suspend fun UserSession.renewed(clientAddress: String) = copy( diff --git a/src/jvmMain/kotlin/starshipfights/info/views_user.kt b/src/jvmMain/kotlin/starshipfights/info/views_user.kt index 2c90631..4b395b5 100644 --- a/src/jvmMain/kotlin/starshipfights/info/views_user.kt +++ b/src/jvmMain/kotlin/starshipfights/info/views_user.kt @@ -212,7 +212,7 @@ suspend fun ApplicationCall.manageUserPage(): HTML.() -> Unit { } p { +"Your private info can be viewed at the " - a(href = "/me/private-info") {+"Private Info"} + a(href = "/me/private-info") { +"Private Info" } +" page." } request.queryParameters["error"]?.let { errorMsg -> @@ -238,7 +238,7 @@ suspend fun ApplicationCall.manageUserPage(): HTML.() -> Unit { val now = Instant.now() val expiredSessions = mutableListOf() allUserSessions.forEach { session -> - if (session.expiration.isBefore(now)) { + if (session.expiration < now) { expiredSessions += session return@forEach } -- 2.25.1