From: TheSaminator Date: Thu, 10 Feb 2022 15:59:56 +0000 (-0500) Subject: Fix test auth X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=aedecbffeb0c15a3a314a5862dc34ee1aff9eae5;p=starship-fights Fix test auth --- diff --git a/src/jvmMain/kotlin/starshipfights/auth/providers.kt b/src/jvmMain/kotlin/starshipfights/auth/providers.kt index 4bc3359..01a5a46 100644 --- a/src/jvmMain/kotlin/starshipfights/auth/providers.kt +++ b/src/jvmMain/kotlin/starshipfights/auth/providers.kt @@ -230,9 +230,9 @@ object TestAuthProvider : AuthProvider { ?: User( discordId = credentials.name, discordName = "", - discordDiscriminator = "0000", + discordDiscriminator = "", discordAvatar = null, - profileName = "Test User" + profileName = credentials.name ).also { User.put(it) } @@ -275,7 +275,7 @@ object TestAuthProvider : AuthProvider { call.respondHtml(HttpStatusCode.OK, page("Authentication Test", call.standardNavBar(), CustomSidebar { p { - +"This instance does not have Discrd OAuth login set up. As a fallback, this authentication mode is used for testing." + +"This instance does not have Discord OAuth login set up. As a fallback, this authentication mode is used for testing." } }) { section { diff --git a/src/jvmMain/kotlin/starshipfights/data/auth/user_sessions.kt b/src/jvmMain/kotlin/starshipfights/data/auth/user_sessions.kt index 2be729a..bc4d7b9 100644 --- a/src/jvmMain/kotlin/starshipfights/data/auth/user_sessions.kt +++ b/src/jvmMain/kotlin/starshipfights/data/auth/user_sessions.kt @@ -24,7 +24,7 @@ data class User( val discordAvatarUrl: String get() = discordAvatar?.let { "https://cdn.discordapp.com/avatars/$discordId/$it." + (if (it.startsWith("a_")) "gif" else "png") + "?size=256" - } ?: "https://cdn.discordapp.com/embed/avatars/${discordDiscriminator.last().digitToInt() % 5}.png" + } ?: "https://cdn.discordapp.com/embed/avatars/${(discordDiscriminator.lastOrNull()?.digitToInt() ?: 0) % 5}.png" companion object Table : DocumentTable by DocumentTable.create({ unique(User::discordId)