diff --git a/common/src/main/kotlin/entity/Interactions.kt b/common/src/main/kotlin/entity/Interactions.kt index a88484e66f41..c897a2fc5681 100644 --- a/common/src/main/kotlin/entity/Interactions.kt +++ b/common/src/main/kotlin/entity/Interactions.kt @@ -326,38 +326,23 @@ sealed class OptionValue(val value: T) { } } -fun OptionValue<*>.intOrNull(): Int? { - return value as? Int -} - -fun OptionValue<*>.stringOrNull(): String? { - return value as? String -} - -fun OptionValue<*>.booleanOrNull(): Boolean? { - return value as? Boolean -} - -fun OptionValue<*>.snowflakeOrNull(): Snowflake? { - val id = stringOrNull() ?: return null - return Snowflake(id) -} fun OptionValue<*>.int(): Int { - return intOrNull() ?: error("$value wasn't an Int.") + return value as? Int ?: error("$value wasn't an Int.") } fun OptionValue<*>.string(): String { - return stringOrNull() ?: error("$value wasn't a String.") + return value.toString() } fun OptionValue<*>.boolean(): Boolean { - return booleanOrNull() ?: error("$value wasn't a Boolean.") + return value as? Boolean ?: error("$value wasn't a Boolean.") } fun OptionValue<*>.snowflake(): Snowflake { - return snowflakeOrNull() ?: error("$value wasn't a Snowflake.") + val id = string().toLongOrNull() ?: error("$value wasn't a Snowflake") + return Snowflake(id) } @Serializable