diff --git a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt index d1923195..bd9e4fe4 100644 --- a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt +++ b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt @@ -130,11 +130,12 @@ class AquaUserServices( suspend fun byName(username: Str, callback: suspend (AquaNetUser) -> T) = async { userRepo.findByUsernameIgnoreCase(username) }?.let { callback(it) } ?: (404 - "User not found") - suspend fun cardByName(username: Str, callback: suspend (Card) -> T) = + suspend fun cardByName(username: Str) = if (username.startsWith("user")) username.substring(4).toLongOrNull() - ?.let { cardRepo.findById(it).getOrNull() } - ?.let { callback(it) } ?: (404 - "Card not found") - else byName(username) { callback(it.ghostCard) } + ?.let { cardRepo.findById(it).getOrNull() } ?: (404 - "Card not found") + else byName(username) { it.ghostCard } + + suspend fun cardByName(username: Str, callback: suspend (Card) -> T) = callback(cardByName(username)) fun validKeychip(keychipId: Str): Bool { if (!allNetProps.checkKeychip) return true