Fix snowflakeOrNull behavior (kordlib#223)

DRSchlaubi · Mar 26, 2021 · f68d75f · f68d75f
1 parent 3162422
commit f68d75f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/kotlin/Util.kt b/core/src/main/kotlin/Util.kt
@@ -30,12 +30,12 @@ import kotlin.reflect.KClass
 
 internal fun String?.toSnowflakeOrNull(): Snowflake? = when {
     this == null -> null
-    else -> runCatching { Snowflake(this) }.getOrNull()
+    else -> Snowflake(this)
 }
 
 internal fun Long?.toSnowflakeOrNull(): Snowflake? = when {
     this == null -> null
-    else -> runCatching { Snowflake(this) }.getOrNull()
+    else -> Snowflake(this)
 }
 
 internal fun String.toInstant() = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(this, Instant::from)

diff --git a/core/src/main/kotlin/entity/interaction/Interaction.kt b/core/src/main/kotlin/entity/interaction/Interaction.kt
@@ -261,7 +261,7 @@ fun OptionValue(value: DiscordOptionValue<*>, resolvedObjects: ResolvedObjects?)
             if (resolvedObjects == null) return OptionValue.StringOptionValue(value.value)
 
             val string = value.value
-            val snowflake = string.toSnowflakeOrNull() ?: return OptionValue.StringOptionValue(string)
+            val snowflake = string.toLongOrNull().toSnowflakeOrNull() ?: return OptionValue.StringOptionValue(string)
 
             when {
                 resolvedObjects.members?.get(snowflake) != null ->