Deserialize time as Duration

common/src/main/kotlin/entity/AuditLog.kt

@@ -3,6 +3,7 @@ package dev.kord.common.entity
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalSnowflake
 import dev.kord.common.entity.optional.orEmpty
+import dev.kord.common.serialization.DurationInWholeDaysSerializer
 import dev.kord.common.serialization.DurationInWholeSecondsSerializer
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*
@@ -348,7 +349,7 @@ public sealed class AuditLogChangeKey<T>(public val name: String, public val ser
     public object ExpireBehavior : AuditLogChangeKey<IntegrationExpireBehavior>("expire_behavior", serializer())
 
     @SerialName("expire_grace_period")
-    public object ExpireGracePeriod : AuditLogChangeKey<Int>("expire_grace_period", serializer())
+    public object ExpireGracePeriod : AuditLogChangeKey<Duration>("expire_grace_period", DurationInWholeDaysSerializer)
 
     @SerialName("user_limit")
     public object UserLimit : AuditLogChangeKey<Int>("user_limit", serializer())

common/src/main/kotlin/entity/DiscordChannel.kt

@@ -5,6 +5,7 @@ import dev.kord.common.entity.optional.OptionalBoolean
 import dev.kord.common.entity.optional.OptionalInt
 import dev.kord.common.entity.optional.OptionalSnowflake
 import dev.kord.common.serialization.DurationInWholeMinutesSerializer
+import dev.kord.common.serialization.DurationInWholeSeconds
 import kotlinx.datetime.Instant
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
@@ -17,7 +18,6 @@ import kotlinx.serialization.encoding.Encoder
 import kotlin.DeprecationLevel.WARNING
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer as InWholeSeconds
 
 /**
  * A representation of a [Discord Channel Structure](https://discord.com/developers/docs/resources/channel).
@@ -60,7 +60,7 @@ public data class DiscordChannel(
     @SerialName("user_limit")
     val userLimit: OptionalInt = OptionalInt.Missing,
     @SerialName("rate_limit_per_user")
-    val rateLimitPerUser: Optional<@Serializable(InWholeSeconds::class) Duration> = Optional.Missing(),
+    val rateLimitPerUser: Optional<DurationInWholeSeconds> = Optional.Missing(),
     val recipients: Optional<List<DiscordUser>> = Optional.Missing(),
     val icon: Optional<String?> = Optional.Missing(),
     @SerialName("owner_id")

common/src/main/kotlin/entity/DiscordGuild.kt

@@ -4,7 +4,7 @@ import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalBoolean
 import dev.kord.common.entity.optional.OptionalInt
 import dev.kord.common.entity.optional.OptionalSnowflake
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer
+import dev.kord.common.serialization.DurationInWholeSeconds
 import kotlinx.datetime.Instant
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
@@ -14,7 +14,6 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlin.time.Duration
 
 /**
  * A partial representation of a [DiscordGuild] that may be [unavailable].
@@ -95,9 +94,7 @@ public data class DiscordGuild(
         ReplaceWith("DiscordChannel#rtcRegion")
     ) val region: String,
     @SerialName("afk_channel_id") val afkChannelId: Snowflake?,
-    @SerialName("afk_timeout")
-    @Serializable(with = DurationInWholeSecondsSerializer::class)
-    val afkTimeout: Duration,
+    @SerialName("afk_timeout") val afkTimeout: DurationInWholeSeconds,
     @SerialName("widget_enabled") val widgetEnabled: OptionalBoolean = OptionalBoolean.Missing,
     @SerialName("widget_channel_id") val widgetChannelId: OptionalSnowflake? = OptionalSnowflake.Missing,
     @SerialName("verification_level") val verificationLevel: VerificationLevel,

common/src/main/kotlin/entity/DiscordIntegration.kt

@@ -2,6 +2,7 @@ package dev.kord.common.entity
 
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalBoolean
+import dev.kord.common.serialization.DurationInWholeDays
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -25,7 +26,7 @@ public data class DiscordIntegration(
     @SerialName("expire_behavior")
     val expireBehavior: IntegrationExpireBehavior,
     @SerialName("expire_grace_period")
-    val expireGracePeriod: Int,
+    val expireGracePeriod: DurationInWholeDays,
     val user: DiscordUser,
     val account: DiscordIntegrationsAccount,
     @SerialName("synced_at")

common/src/main/kotlin/entity/DiscordInvite.kt

@@ -2,7 +2,7 @@ package dev.kord.common.entity
 
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalInt
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer
+import dev.kord.common.serialization.DurationInWholeSeconds
 import kotlinx.datetime.Instant
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
@@ -12,7 +12,6 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlin.time.Duration
 
 public sealed interface BaseDiscordInvite {
     public val code: String
@@ -80,8 +79,7 @@ public data class DiscordInviteWithMetadata(
     @SerialName("max_uses")
     val maxUses: Int,
     @SerialName("max_age")
-    @Serializable(with = DurationInWholeSecondsSerializer::class)
-    val maxAge: Duration,
+    val maxAge: DurationInWholeSeconds,
     val temporary: Boolean,
     @SerialName("created_at")
     val createdAt: Instant,

common/src/main/kotlin/serialization/DurationSerializers.kt

@@ -1,6 +1,7 @@
 package dev.kord.common.serialization
 
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -28,23 +29,64 @@ public sealed class DurationSerializer(private val unit: DurationUnit, name: Str
 }
 
 
+// nanoseconds
+
 /** Serializer that encodes and decodes [Duration]s in [whole nanoseconds][Duration.inWholeNanoseconds]. */
 public object DurationInWholeNanosecondsSerializer : DurationSerializer(NANOSECONDS, "DurationInWholeNanoseconds")
 
+/** A [Duration] that is [serializable][Serializable] with [DurationInWholeNanosecondsSerializer]. */
+public typealias DurationInWholeNanoseconds = @Serializable(with = DurationInWholeNanosecondsSerializer::class) Duration
+
+
+// microseconds
+
 /** Serializer that encodes and decodes [Duration]s in [whole microseconds][Duration.inWholeMicroseconds]. */
 public object DurationInWholeMicrosecondsSerializer : DurationSerializer(MICROSECONDS, "DurationInWholeMicroseconds")
 
+/** A [Duration] that is [serializable][Serializable] with [DurationInWholeMicrosecondsSerializer]. */
+public typealias DurationInWholeMicroseconds = @Serializable(with = DurationInWholeMicrosecondsSerializer::class) Duration
+
+
+// milliseconds
+
 /** Serializer that encodes and decodes [Duration]s in [whole milliseconds][Duration.inWholeMilliseconds]. */
 public object DurationInWholeMillisecondsSerializer : DurationSerializer(MILLISECONDS, "DurationInWholeMilliseconds")
 
+/** A [Duration] that is [serializable][Serializable] with [DurationInWholeMillisecondsSerializer]. */
+public typealias DurationInWholeMilliseconds = @Serializable(with = DurationInWholeMillisecondsSerializer::class) Duration
+
+
+// seconds
+
 /** Serializer that encodes and decodes [Duration]s in [whole seconds][Duration.inWholeSeconds]. */
 public object DurationInWholeSecondsSerializer : DurationSerializer(SECONDS, "DurationInWholeSeconds")
 
+/** A [Duration] that is [serializable][Serializable] with [DurationInWholeSecondsSerializer]. */
+public typealias DurationInWholeSeconds = @Serializable(with = DurationInWholeSecondsSerializer::class) Duration
+
+
+// minutes
+
 /** Serializer that encodes and decodes [Duration]s in [whole minutes][Duration.inWholeMinutes]. */
 public object DurationInWholeMinutesSerializer : DurationSerializer(MINUTES, "DurationInWholeMinutes")
 
+/** A [Duration] that is [serializable][Serializable] with [DurationInWholeMinutesSerializer]. */
+public typealias DurationInWholeMinutes = @Serializable(with = DurationInWholeMinutesSerializer::class) Duration
+
+
+// hours
+
 /** Serializer that encodes and decodes [Duration]s in [whole hours][Duration.inWholeHours]. */
 public object DurationInWholeHoursSerializer : DurationSerializer(HOURS, "DurationInWholeHours")
 
+/** A [Duration] that is [serializable][Serializable] with [DurationInWholeHoursSerializer]. */
+public typealias DurationInWholeHours = @Serializable(with = DurationInWholeHoursSerializer::class) Duration
+
+
+// days
+
 /** Serializer that encodes and decodes [Duration]s in [whole days][Duration.inWholeDays]. */
 public object DurationInWholeDaysSerializer : DurationSerializer(DAYS, "DurationInWholeDays")
+
+/** A [Duration] that is [serializable][Serializable] with [DurationInWholeDaysSerializer]. */
+public typealias DurationInWholeDays = @Serializable(with = DurationInWholeDaysSerializer::class) Duration

core/src/main/kotlin/cache/data/ChannelData.kt

@@ -4,10 +4,9 @@ import dev.kord.cache.api.data.DataDescription
 import dev.kord.cache.api.data.description
 import dev.kord.common.entity.*
 import dev.kord.common.entity.optional.*
+import dev.kord.common.serialization.DurationInWholeSeconds
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
-import kotlin.time.Duration
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer as InWholeSeconds
 
 @Serializable
 public data class ChannelData(
@@ -22,7 +21,7 @@ public data class ChannelData(
     val lastMessageId: OptionalSnowflake? = OptionalSnowflake.Missing,
     val bitrate: OptionalInt = OptionalInt.Missing,
     val userLimit: OptionalInt = OptionalInt.Missing,
-    val rateLimitPerUser: Optional<@Serializable(InWholeSeconds::class) Duration> = Optional.Missing(),
+    val rateLimitPerUser: Optional<DurationInWholeSeconds> = Optional.Missing(),
     val recipients: Optional<List<Snowflake>> = Optional.Missing(),
     val icon: Optional<String?> = Optional.Missing(),
     val ownerId: OptionalSnowflake = OptionalSnowflake.Missing,

core/src/main/kotlin/cache/data/GuildData.kt

@@ -4,9 +4,8 @@ import dev.kord.cache.api.data.DataDescription
 import dev.kord.cache.api.data.description
 import dev.kord.common.entity.*
 import dev.kord.common.entity.optional.*
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer
+import dev.kord.common.serialization.DurationInWholeSeconds
 import kotlinx.serialization.Serializable
-import kotlin.time.Duration
 
 private val MessageData.nullableGuildId get() = guildId.value
 private val ChannelData.nullableGuildId get() = guildId.value
@@ -26,8 +25,7 @@ public data class GuildData(
     @Deprecated("The region field has been moved to Channel#rtcRegion in Discord API v9", ReplaceWith("ChannelData#rtcRegion"))
     val region: String,
     val afkChannelId: Snowflake? = null,
-    @Serializable(with = DurationInWholeSecondsSerializer::class)
-    val afkTimeout: Duration,
+    val afkTimeout: DurationInWholeSeconds,
     val widgetEnabled: OptionalBoolean = OptionalBoolean.Missing,
     val widgetChannelId: OptionalSnowflake? = OptionalSnowflake.Missing,
     val verificationLevel: VerificationLevel,

core/src/main/kotlin/cache/data/IntegrationData.kt

@@ -2,6 +2,7 @@ package dev.kord.core.cache.data
 
 import dev.kord.common.entity.*
 import dev.kord.common.entity.optional.OptionalBoolean
+import dev.kord.common.serialization.DurationInWholeDays
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -15,7 +16,7 @@ public data class IntegrationData(
     val roleId: Snowflake,
     val enableEmoticons: OptionalBoolean = OptionalBoolean.Missing,
     val expireBehavior: IntegrationExpireBehavior,
-    val expireGracePeriod: Int,
+    val expireGracePeriod: DurationInWholeDays,
     val user: DiscordUser,
     val account: IntegrationsAccountData,
     val syncedAt: String,

core/src/main/kotlin/cache/data/InviteCreateData.kt

@@ -6,10 +6,9 @@ import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalSnowflake
 import dev.kord.common.entity.optional.map
 import dev.kord.common.entity.optional.mapSnowflake
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer
+import dev.kord.common.serialization.DurationInWholeSeconds
 import dev.kord.gateway.DiscordCreatedInvite
 import kotlinx.serialization.Serializable
-import kotlin.time.Duration
 
 @Serializable
 public data class InviteCreateData(
@@ -18,8 +17,7 @@ public data class InviteCreateData(
     val createdAt: String,
     val guildId: OptionalSnowflake = OptionalSnowflake.Missing,
     val inviterId: OptionalSnowflake = OptionalSnowflake.Missing,
-    @Serializable(with = DurationInWholeSecondsSerializer::class)
-    val maxAge: Duration,
+    val maxAge: DurationInWholeSeconds,
     val maxUses: Int,
     val targetType: Optional<InviteTargetType> = Optional.Missing(),
     val targetUserId: OptionalSnowflake = OptionalSnowflake.Missing,

core/src/main/kotlin/cache/data/InviteData.kt

@@ -2,10 +2,9 @@ package dev.kord.core.cache.data
 
 import dev.kord.common.entity.*
 import dev.kord.common.entity.optional.*
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer
+import dev.kord.common.serialization.DurationInWholeSeconds
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
-import kotlin.time.Duration
 
 public sealed interface BaseInviteData {
     public val code: String
@@ -75,8 +74,7 @@ public data class InviteWithMetadataData(
     override val guildScheduledEvent: Optional<GuildScheduledEventData> = Optional.Missing(),
     val uses: Int,
     val maxUses: Int,
-    @Serializable(with = DurationInWholeSecondsSerializer::class)
-    val maxAge: Duration,
+    val maxAge: DurationInWholeSeconds,
     val temporary: Boolean,
     val createdAt: Instant,
 ) : BaseInviteData {

core/src/main/kotlin/entity/Integration.kt

@@ -19,7 +19,6 @@ import java.util.*
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.days
 
 /**
  * A [Discord integration](https://discord.com/developers/docs/resources/guild#get-guild-integrations).
@@ -95,10 +94,9 @@ public class Integration(
         get() = data.expireBehavior
 
     /**
-     * The grace period in days before expiring subscribers.
+     * The grace period before expiring subscribers.
      */
-    public val expireGracePeriod: Duration
-        get() = data.expireGracePeriod.days
+    public val expireGracePeriod: Duration get() = data.expireGracePeriod
 
     /**
      * The id of the [user][User] for this integration.

gateway/src/main/kotlin/Event.kt

@@ -4,8 +4,11 @@ import dev.kord.common.entity.*
 import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalBoolean
 import dev.kord.common.entity.optional.OptionalSnowflake
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer
-import kotlinx.serialization.*
+import dev.kord.common.serialization.DurationInWholeSeconds
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.PrimitiveKind
@@ -18,7 +21,6 @@ import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import mu.KotlinLogging
-import kotlin.time.Duration
 import kotlinx.serialization.DeserializationStrategy as KDeserializationStrategy
 
 private val jsonLogger = KotlinLogging.logger { }
@@ -628,8 +630,7 @@ public data class DiscordCreatedInvite(
     val guildId: OptionalSnowflake = OptionalSnowflake.Missing,
     val inviter: Optional<DiscordUser> = Optional.Missing(),
     @SerialName("max_age")
-    @Serializable(with = DurationInWholeSecondsSerializer::class)
-    val maxAge: Duration,
+    val maxAge: DurationInWholeSeconds,
     @SerialName("max_uses")
     val maxUses: Int,
     @SerialName("target_type")

rest/src/main/kotlin/json/request/ChannelRequests.kt

@@ -5,11 +5,10 @@ import dev.kord.common.entity.optional.Optional
 import dev.kord.common.entity.optional.OptionalBoolean
 import dev.kord.common.entity.optional.OptionalInt
 import dev.kord.common.entity.optional.OptionalSnowflake
+import dev.kord.common.serialization.DurationInWholeSeconds
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlin.time.Duration
-import dev.kord.common.serialization.DurationInWholeSecondsSerializer as InWholeSeconds
 
 @Serializable
 public data class ChannelModifyPutRequest(
@@ -35,7 +34,7 @@ public data class ChannelModifyPatchRequest(
     val topic: Optional<String?> = Optional.Missing(),
     val nsfw: OptionalBoolean? = OptionalBoolean.Missing,
     @SerialName("rate_limit_per_user")
-    val rateLimitPerUser: Optional<@Serializable(InWholeSeconds::class) Duration?> = Optional.Missing(),
+    val rateLimitPerUser: Optional<DurationInWholeSeconds?> = Optional.Missing(),
     val bitrate: OptionalInt? = OptionalInt.Missing,
     @SerialName("user_limit")
     val userLimit: OptionalInt? = OptionalInt.Missing,