merge: main -> feat/entitlements

core/src/commonMain/kotlin/Util.kt

@@ -29,8 +29,10 @@ import kotlin.contracts.contract
 import kotlin.reflect.KClass
 
 internal inline fun <T> catchNotFound(block: () -> T): T? {
+    // block is called exactly once, but might not be executed fully, even if catchNotFound returns normally
+    // -> AT_MOST_ONCE, see https://youtrack.jetbrains.com/issue/KT-63414
     contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        callsInPlace(block, InvocationKind.AT_MOST_ONCE)
     }
     return try {
         block()
@@ -41,8 +43,10 @@ internal inline fun <T> catchNotFound(block: () -> T): T? {
 }
 
 internal inline fun <T> catchDiscordError(vararg codes: JsonErrorCode, block: () -> T): T? {
+    // block is called exactly once, but might not be executed fully, even if catchDiscordError returns normally
+    // -> AT_MOST_ONCE, see https://youtrack.jetbrains.com/issue/KT-63414
     contract {
-        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+        callsInPlace(block, InvocationKind.AT_MOST_ONCE)
     }
     return try {
         block()

core/src/commonMain/kotlin/builder/kord/KordBuilder.kt

@@ -34,8 +34,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.serialization.json.Json
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 
 private val gatewayInfoJson = Json { ignoreUnknownKeys = true }
 
@@ -169,7 +167,6 @@ public abstract class BaseKordBuilder internal constructor(public val token: Str
      * ```
      */
     public fun cache(builder: KordCacheBuilder.(resources: ClientResources) -> Unit) {
-        contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
         val old = cacheBuilder
         cacheBuilder = { resources: ClientResources ->
             old(resources)

core/src/commonMain/kotlin/cache/data/ApplicationCommandData.kt

@@ -27,9 +27,11 @@ public data class ApplicationCommandData(
     val version: Snowflake
 ) {
     public companion object {
-        public val description: DataDescription<ApplicationCommandData, Snowflake> = description(ApplicationCommandData::id) {
-            link(ApplicationCommandData::guildId to GuildData::id)
-        }
+        public val description: DataDescription<ApplicationCommandData, Snowflake> =
+            description(ApplicationCommandData::id) {
+                link(ApplicationCommandData::id to GuildApplicationCommandPermissionsData::id)
+            }
+
         public fun from(command: DiscordApplicationCommand): ApplicationCommandData {
             return with(command) {
                 ApplicationCommandData(

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

@@ -49,7 +49,12 @@ public data class ChannelData(
 
 
     public companion object {
-        public val description: DataDescription<ChannelData, Snowflake> = description(ChannelData::id)
+        public val description: DataDescription<ChannelData, Snowflake> = description(ChannelData::id) {
+            link(ChannelData::id to MessageData::channelId)
+            link(ChannelData::id to ThreadMemberData::id)
+            link(ChannelData::id to WebhookData::channelId)
+            link(ChannelData::id to VoiceStateData::channelId)
+        }
 
         public fun from(entity: DiscordChannel): ChannelData = with(entity) {
             ChannelData(

core/src/commonMain/kotlin/cache/data/GuildApplicationCommandPermissionsData.kt

@@ -14,10 +14,7 @@ public data class GuildApplicationCommandPermissionsData(
 
     public companion object {
         public val description: DataDescription<GuildApplicationCommandPermissionsData, Snowflake> =
-            description(GuildApplicationCommandPermissionsData::id) {
-                link(GuildApplicationCommandPermissionsData::guildId to GuildData::id)
-                link(GuildApplicationCommandPermissionsData::id to ApplicationCommandData::id)
-            }
+            description(GuildApplicationCommandPermissionsData::id)
 
         public fun from(permissions: DiscordGuildApplicationCommandPermissions): GuildApplicationCommandPermissionsData =
             with(permissions) {

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

@@ -8,10 +8,12 @@ import dev.kord.common.serialization.DurationInSeconds
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 
+private val ApplicationCommandData.nullableGuildId get() = guildId.value
 private val EntitlementData.nullableGuildId get() = guildId.value
 private val MessageData.nullableGuildId get() = guildId.value
 private val ChannelData.nullableGuildId get() = guildId.value
 private val WebhookData.nullableGuildId get() = guildId.value
+private val StickerData.nullableGuildId get() = guildId.value
 
 @Serializable
 public data class GuildData(
@@ -72,14 +74,17 @@ public data class GuildData(
     public companion object {
 
         public val description: DataDescription<GuildData, Snowflake> = description(GuildData::id) {
-
+            link(GuildData::id to ApplicationCommandData::nullableGuildId)
+            link(GuildData::id to GuildApplicationCommandPermissionsData::guildId)
             link(GuildData::id to RoleData::guildId)
             link(GuildData::id to ChannelData::nullableGuildId)
             link(GuildData::id to MemberData::guildId)
             link(GuildData::id to MessageData::nullableGuildId)
             link(GuildData::id to WebhookData::nullableGuildId)
             link(GuildData::id to VoiceStateData::guildId)
             link(GuildData::id to PresenceData::guildId)
+            link(GuildData::id to StickerData::nullableGuildId)
+            link(GuildData::id to EmojiData::guildId)
             link(GuildData::id to AutoModerationRuleData::guildId)
             link(GuildData::id to EntitlementData::nullableGuildId)
 

core/src/commonMain/kotlin/cache/data/StickerData.kt

@@ -24,11 +24,7 @@ public data class StickerData(
 ) {
     public companion object {
 
-        public val description: DataDescription<StickerData, Snowflake> = description(StickerData::id) {
-            link(StickerData::guildId to GuildData::id)
-            link(StickerData::packId to StickerPackData::id)
-        }
-
+        public val description: DataDescription<StickerData, Snowflake> = description(StickerData::id)
 
         public fun from(entity: DiscordMessageSticker): StickerData = with(entity) {
             StickerData(id, packId, name, description, tags, formatType, available, guildId, user.map { it.toData() }, sortValue)
@@ -49,6 +45,7 @@ public data class StickerItemData(
     }
 }
 
+private val StickerData.nullablePackId get() = packId.value
 
 public data class StickerPackData(
     val id: Snowflake,
@@ -58,13 +55,15 @@ public data class StickerPackData(
     val coverStickerId: OptionalSnowflake = OptionalSnowflake.Missing,
     val description: String,
     val bannerAssetId: Snowflake
-    ) {
+) {
     public companion object {
 
-        public val description: DataDescription<StickerPackData, Snowflake> = description(StickerPackData::id)
+        public val description: DataDescription<StickerPackData, Snowflake> = description(StickerPackData::id) {
+            link(StickerPackData::id to StickerData::nullablePackId)
+        }
 
         public fun from(entity: DiscordStickerPack): StickerPackData = with(entity) {
             StickerPackData(id, stickers.map { StickerData.from(it) }, name, skuId, coverStickerId, description, bannerAssetId)
         }
     }
-}
+}

core/src/commonMain/kotlin/cache/data/UserData.kt

@@ -11,7 +11,7 @@ import dev.kord.common.entity.optional.OptionalBoolean
 import kotlinx.serialization.Serializable
 
 private val EntitlementData.nullableUserId get() = userId.value
-private val WebhookData.nullableUserId get() = userId.value
+private val ThreadMemberData.nullableUserId get() = userId.value
 
 @Serializable
 public data class UserData(
@@ -30,7 +30,7 @@ public data class UserData(
 
         public val description: DataDescription<UserData, Snowflake> = description(UserData::id) {
             link(UserData::id to MemberData::userId)
-            link(UserData::id to WebhookData::nullableUserId)
+            link(UserData::id to ThreadMemberData::nullableUserId)
             link(UserData::id to VoiceStateData::userId)
             link(UserData::id to PresenceData::userId)
             link(UserData::id to EntitlementData::nullableUserId)
@@ -48,3 +48,4 @@ public data class UserData(
 }
 
 public fun DiscordUser.toData(): UserData = UserData.from(this)
+