Optimize imports

kordlib · Sep 25, 2024 · 61206ea · 61206ea
1 parent 17ec83f
commit 61206ea
Show file tree

Hide file tree

Showing 58 changed files with 32 additions and 64 deletions.
diff --git a/common/src/commonMain/kotlin/entity/Snowflake.kt b/common/src/commonMain/kotlin/entity/Snowflake.kt
@@ -1,6 +1,5 @@
 package dev.kord.common.entity
 
-import dev.kord.common.entity.Snowflake.Companion.validValues
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.KSerializer

diff --git a/common/src/commonTest/kotlin/entity/MessageFlagTest.kt b/common/src/commonTest/kotlin/entity/MessageFlagTest.kt
@@ -1,6 +1,5 @@
 package dev.kord.common.entity
 
-import dev.kord.ksp.Generate.EntityType.INT_FLAGS
 import kotlin.random.Random
 import kotlin.random.nextInt
 import kotlin.test.Test

diff --git a/common/src/commonTest/kotlin/entity/PermissionTest.kt b/common/src/commonTest/kotlin/entity/PermissionTest.kt
@@ -1,6 +1,5 @@
 package dev.kord.common.entity
 
-import dev.kord.ksp.Generate.EntityType.BIT_SET_FLAGS
 import kotlin.random.Random
 import kotlin.random.nextInt
 import kotlin.test.*

diff --git a/common/src/commonTest/kotlin/entity/optional/OptionalBooleanTest.kt b/common/src/commonTest/kotlin/entity/optional/OptionalBooleanTest.kt
@@ -2,7 +2,6 @@ package dev.kord.common.entity.optional
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlin.js.JsName
 import kotlin.test.Test

diff --git a/common/src/commonTest/kotlin/entity/optional/OptionalIntTest.kt b/common/src/commonTest/kotlin/entity/optional/OptionalIntTest.kt
@@ -2,7 +2,6 @@ package dev.kord.common.entity.optional
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlin.js.JsName
 import kotlin.test.*

diff --git a/common/src/commonTest/kotlin/entity/optional/OptionalLongTest.kt b/common/src/commonTest/kotlin/entity/optional/OptionalLongTest.kt
@@ -2,7 +2,6 @@ package dev.kord.common.entity.optional
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlin.js.JsName
 import kotlin.test.*

diff --git a/common/src/commonTest/kotlin/entity/optional/OptionalSnowflakeTest.kt b/common/src/commonTest/kotlin/entity/optional/OptionalSnowflakeTest.kt
@@ -3,7 +3,6 @@ package dev.kord.common.entity.optional
 import dev.kord.common.entity.Snowflake
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlin.js.JsName
 import kotlin.test.*

diff --git a/common/src/commonTest/kotlin/entity/optional/OptionalTest.kt b/common/src/commonTest/kotlin/entity/optional/OptionalTest.kt
@@ -2,7 +2,6 @@ package dev.kord.common.entity.optional
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlin.js.JsName
 import kotlin.test.Test

diff --git a/common/src/commonTest/kotlin/json/ChannelTest.kt b/common/src/commonTest/kotlin/json/ChannelTest.kt
@@ -6,8 +6,8 @@ import dev.kord.common.readFile
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.json.Json
 import kotlin.js.JsName
-import kotlin.time.Duration.Companion.seconds
 import kotlin.test.Test
+import kotlin.time.Duration.Companion.seconds
 
 private suspend fun file(name: String): String = readFile("channel", name)
 

diff --git a/common/src/jvmTest/kotlin/ColorTestsJvm.kt b/common/src/jvmTest/kotlin/ColorTestsJvm.kt
@@ -1,8 +1,7 @@
 package dev.kord.common
 
-import kotlin.test.assertEquals
-
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class ColorTestsJvm {
     @Test

diff --git a/core/live-tests/src/commonTest/kotlin/regression/CacheMissRegression.kt b/core/live-tests/src/commonTest/kotlin/regression/CacheMissRegression.kt
@@ -18,7 +18,6 @@ import io.ktor.client.*
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
-import io.ktor.content.*
 import io.ktor.http.*
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.SupervisorJob

diff --git a/core/src/commonMain/kotlin/behavior/GuildEmojiBehavior.kt b/core/src/commonMain/kotlin/behavior/GuildEmojiBehavior.kt
@@ -3,8 +3,8 @@ package dev.kord.core.behavior
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
 import dev.kord.core.cache.data.EmojiData
-import dev.kord.core.entity.KordEntity
 import dev.kord.core.entity.GuildEmoji
+import dev.kord.core.entity.KordEntity
 import dev.kord.core.entity.Strategizable
 import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier

diff --git a/core/src/commonMain/kotlin/behavior/MessageBehavior.kt b/core/src/commonMain/kotlin/behavior/MessageBehavior.kt
@@ -1,6 +1,5 @@
 package dev.kord.core.behavior
 
-import dev.kord.common.entity.Permission
 import dev.kord.common.entity.Snowflake
 import dev.kord.common.exception.RequestException
 import dev.kord.core.Kord
@@ -10,6 +9,7 @@ import dev.kord.core.cache.data.MessageData
 import dev.kord.core.entity.*
 import dev.kord.core.entity.channel.MessageChannel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.core.supplier.getChannelOf
@@ -20,7 +20,6 @@ import dev.kord.rest.builder.message.modify.WebhookMessageModifyBuilder
 import dev.kord.rest.request.RestRequestException
 import dev.kord.rest.service.RestClient
 import kotlinx.coroutines.flow.Flow
-import dev.kord.core.hash
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 

diff --git a/core/src/commonMain/kotlin/behavior/TemplateBehavior.kt b/core/src/commonMain/kotlin/behavior/TemplateBehavior.kt
@@ -6,9 +6,9 @@ import dev.kord.core.KordObject
 import dev.kord.core.cache.data.toData
 import dev.kord.core.entity.Guild
 import dev.kord.core.entity.Template
+import dev.kord.core.hash
 import dev.kord.rest.builder.template.GuildFromTemplateCreateBuilder
 import dev.kord.rest.builder.template.GuildTemplateModifyBuilder
-import dev.kord.core.hash
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 

diff --git a/core/src/commonMain/kotlin/behavior/UserBehavior.kt b/core/src/commonMain/kotlin/behavior/UserBehavior.kt
@@ -8,14 +8,14 @@ import dev.kord.core.entity.*
 import dev.kord.core.entity.channel.Channel
 import dev.kord.core.entity.channel.DmChannel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.json.JsonErrorCode
 import dev.kord.rest.json.request.DMCreateRequest
 import dev.kord.rest.request.RestRequestException
 import dev.kord.rest.service.RestClient
 import io.ktor.http.*
-import dev.kord.core.hash
 
 /**
  * The behavior of a [Discord User](https://discord.com/developers/docs/resources/user)

diff --git a/core/src/commonMain/kotlin/behavior/WebhookBehavior.kt b/core/src/commonMain/kotlin/behavior/WebhookBehavior.kt
@@ -10,12 +10,12 @@ import dev.kord.core.entity.Message
 import dev.kord.core.entity.Strategizable
 import dev.kord.core.entity.Webhook
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.builder.message.create.WebhookMessageCreateBuilder
 import dev.kord.rest.builder.webhook.WebhookModifyBuilder
 import dev.kord.rest.request.RestRequestException
-import dev.kord.core.hash
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 

diff --git a/core/src/commonMain/kotlin/behavior/channel/CategorizableChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/CategorizableChannelBehavior.kt
@@ -9,6 +9,7 @@ import dev.kord.core.entity.InviteWithMetadata
 import dev.kord.core.entity.Webhook
 import dev.kord.core.entity.channel.CategorizableChannel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.builder.channel.InviteCreateBuilder
@@ -17,7 +18,6 @@ import dev.kord.rest.request.RestRequestException
 import dev.kord.rest.service.RestClient
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import dev.kord.core.hash
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 

diff --git a/core/src/commonMain/kotlin/behavior/channel/ChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/ChannelBehavior.kt
@@ -7,12 +7,12 @@ import dev.kord.core.entity.KordEntity
 import dev.kord.core.entity.Strategizable
 import dev.kord.core.entity.channel.Channel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.core.supplier.getChannelOf
 import dev.kord.core.supplier.getChannelOfOrNull
 import dev.kord.rest.request.RestRequestException
-import dev.kord.core.hash
 
 /**
  * The behavior of a [Discord Channel](https://discord.com/developers/docs/resources/channel)

diff --git a/core/src/commonMain/kotlin/behavior/channel/GuildChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/GuildChannelBehavior.kt
@@ -10,9 +10,9 @@ import dev.kord.core.entity.Strategizable
 import dev.kord.core.entity.channel.GuildChannel
 import dev.kord.core.entity.channel.TopGuildChannel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
-import dev.kord.core.hash
 
 /**
  * The behavior of a Discord channel associated to a [guild].

diff --git a/core/src/commonMain/kotlin/behavior/channel/MessageChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/MessageChannelBehavior.kt
@@ -12,7 +12,6 @@ import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.builder.message.EmbedBuilder
-import dev.kord.rest.builder.message.create.MessageCreateBuilder
 import dev.kord.rest.builder.message.create.UserMessageCreateBuilder
 import dev.kord.rest.builder.message.embed
 import dev.kord.rest.request.RestRequestException

diff --git a/core/src/commonMain/kotlin/behavior/channel/NewsChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/NewsChannelBehavior.kt
@@ -1,7 +1,6 @@
 package dev.kord.core.behavior.channel
 
 import dev.kord.common.entity.ChannelType
-import dev.kord.common.entity.Permission
 import dev.kord.common.entity.Snowflake
 import dev.kord.common.exception.RequestException
 import dev.kord.core.Kord

diff --git a/core/src/commonMain/kotlin/behavior/channel/TopGuildChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/TopGuildChannelBehavior.kt
@@ -6,6 +6,7 @@ import dev.kord.core.Kord
 import dev.kord.core.entity.PermissionOverwrite
 import dev.kord.core.entity.channel.TopGuildChannel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.builder.channel.ChannelPermissionModifyBuilder
@@ -14,7 +15,6 @@ import dev.kord.rest.service.editMemberPermissions
 import dev.kord.rest.service.editRolePermission
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.withIndex
-import dev.kord.core.hash
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 

diff --git a/core/src/commonMain/kotlin/behavior/channel/VoiceChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/VoiceChannelBehavior.kt
@@ -7,12 +7,12 @@ import dev.kord.core.cache.data.ChannelData
 import dev.kord.core.entity.channel.Channel
 import dev.kord.core.entity.channel.VoiceChannel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.builder.channel.VoiceChannelModifyBuilder
 import dev.kord.rest.request.RestRequestException
 import dev.kord.rest.service.patchVoiceChannel
-import dev.kord.core.hash
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 

diff --git a/core/src/commonMain/kotlin/behavior/channel/threads/ThreadParentChannelBehavior.kt b/core/src/commonMain/kotlin/behavior/channel/threads/ThreadParentChannelBehavior.kt
@@ -12,14 +12,14 @@ import dev.kord.core.entity.channel.Channel
 import dev.kord.core.entity.channel.ThreadParentChannel
 import dev.kord.core.entity.channel.thread.ThreadChannel
 import dev.kord.core.exception.EntityNotFoundException
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
-import dev.kord.rest.builder.channel.thread.StartThreadWithMessageBuilder
 import dev.kord.rest.builder.channel.thread.StartThreadBuilder
+import dev.kord.rest.builder.channel.thread.StartThreadWithMessageBuilder
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 import kotlinx.datetime.Instant
-import dev.kord.core.hash
 
 /**
  * Behavior of channels that can contain public threads.

diff --git a/core/src/commonMain/kotlin/behavior/interaction/ActionInteractionBehavior.kt b/core/src/commonMain/kotlin/behavior/interaction/ActionInteractionBehavior.kt
@@ -1,7 +1,6 @@
 package dev.kord.core.behavior.interaction
 
 import dev.kord.common.annotation.KordUnsafe
-import dev.kord.common.entity.MessageFlag
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
 import dev.kord.core.behavior.interaction.response.*

diff --git a/core/src/commonMain/kotlin/behavior/interaction/ComponentInteractionBehavior.kt b/core/src/commonMain/kotlin/behavior/interaction/ComponentInteractionBehavior.kt
@@ -1,6 +1,5 @@
 package dev.kord.core.behavior.interaction
 
-import dev.kord.common.entity.MessageFlag
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
 import dev.kord.core.behavior.interaction.response.EphemeralMessageInteractionResponseBehavior

diff --git a/...nMain/kotlin/behavior/interaction/response/DeferredEphemeralMessageInteractionBehavior.kt b/...nMain/kotlin/behavior/interaction/response/DeferredEphemeralMessageInteractionBehavior.kt
@@ -1,6 +1,5 @@
 package dev.kord.core.behavior.interaction.response
 
-import dev.kord.common.entity.MessageFlag
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
 import dev.kord.core.behavior.interaction.ActionInteractionBehavior

diff --git a/...nMain/kotlin/behavior/interaction/response/EphemeralMessageInteractionResponseBehavior.kt b/...nMain/kotlin/behavior/interaction/response/EphemeralMessageInteractionResponseBehavior.kt
@@ -1,6 +1,5 @@
 package dev.kord.core.behavior.interaction.response
 
-import dev.kord.common.entity.MessageFlag
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
 import dev.kord.core.behavior.interaction.*

diff --git a/...ain/kotlin/behavior/interaction/response/FollowupPermittingInteractionResponseBehavior.kt b/...ain/kotlin/behavior/interaction/response/FollowupPermittingInteractionResponseBehavior.kt
@@ -1,6 +1,5 @@
 package dev.kord.core.behavior.interaction.response
 
-import dev.kord.common.entity.MessageFlag
 import dev.kord.common.entity.Snowflake
 import dev.kord.core.Kord
 import dev.kord.core.behavior.interaction.InteractionBehavior

diff --git a/core/src/commonMain/kotlin/builder/kord/KordProxyBuilder.kt b/core/src/commonMain/kotlin/builder/kord/KordProxyBuilder.kt
@@ -2,7 +2,6 @@ package dev.kord.core.builder.kord
 
 import dev.kord.common.annotation.KordExperimental
 import dev.kord.common.entity.Snowflake
-import dev.kord.core.Kord
 
 /**
  * The proxy Kord builder. You probably want to invoke the [DSL builder][Kord.proxy] instead.

diff --git a/core/src/commonMain/kotlin/builder/kord/KordRestOnlyBuilder.kt b/core/src/commonMain/kotlin/builder/kord/KordRestOnlyBuilder.kt
@@ -2,7 +2,6 @@ package dev.kord.core.builder.kord
 
 import dev.kord.common.annotation.KordExperimental
 import dev.kord.common.entity.Snowflake
-import dev.kord.core.Kord
 
 /**
  * The rest only Kord builder. You probably want to invoke the [DSL builder][Kord.restOnly] instead.

diff --git a/core/src/commonMain/kotlin/cache/data/ApplicationData.kt b/core/src/commonMain/kotlin/cache/data/ApplicationData.kt
@@ -4,9 +4,7 @@ import dev.kord.common.entity.*
 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.mapNullable
 import dev.kord.common.entity.optional.mapSnowflake
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 public sealed interface BaseApplicationData {

diff --git a/core/src/commonMain/kotlin/cache/data/MessageInteractionData.kt b/core/src/commonMain/kotlin/cache/data/MessageInteractionData.kt
@@ -2,7 +2,6 @@ package dev.kord.core.cache.data
 
 import dev.kord.common.entity.DiscordInteractionMetadata
 import dev.kord.common.entity.DiscordMessageInteraction
-import dev.kord.common.entity.DiscordUser
 import dev.kord.common.entity.IntegrationOwners
 import dev.kord.common.entity.InteractionType
 import dev.kord.common.entity.Snowflake

diff --git a/core/src/commonMain/kotlin/cache/data/PermissionOverwriteData.kt b/core/src/commonMain/kotlin/cache/data/PermissionOverwriteData.kt
@@ -1,7 +1,7 @@
 package dev.kord.core.cache.data
 
-import dev.kord.common.entity.Overwrite
 import dev.kord.common.entity.*
+import dev.kord.common.entity.Overwrite
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/core/src/commonMain/kotlin/entity/Emoji.kt b/core/src/commonMain/kotlin/entity/Emoji.kt
@@ -8,13 +8,13 @@ import dev.kord.core.behavior.MemberBehavior
 import dev.kord.core.behavior.RoleBehavior
 import dev.kord.core.behavior.UserBehavior
 import dev.kord.core.cache.data.EmojiData
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.builder.guild.EmojiModifyBuilder
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
-import dev.kord.core.hash
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 

diff --git a/core/src/commonMain/kotlin/entity/Integration.kt b/core/src/commonMain/kotlin/entity/Integration.kt
@@ -2,7 +2,6 @@ package dev.kord.core.entity
 
 import dev.kord.common.entity.IntegrationExpireBehavior
 import dev.kord.common.entity.Snowflake
-import dev.kord.common.entity.optional.value
 import dev.kord.common.exception.RequestException
 import dev.kord.core.Kord
 import dev.kord.core.behavior.GuildBehavior

diff --git a/core/src/commonMain/kotlin/entity/Member.kt b/core/src/commonMain/kotlin/entity/Member.kt
@@ -12,11 +12,11 @@ import dev.kord.core.behavior.UserBehavior
 import dev.kord.core.cache.data.MemberData
 import dev.kord.core.cache.data.UserData
 import dev.kord.core.entity.interaction.GuildInteraction
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
 import kotlinx.coroutines.flow.*
 import kotlinx.datetime.Instant
-import dev.kord.core.hash
 
 /**
  * An instance of a [Discord Member](https://discord.com/developers/docs/resources/guild#guild-member-object).

diff --git a/core/src/commonMain/kotlin/entity/Role.kt b/core/src/commonMain/kotlin/entity/Role.kt
@@ -8,9 +8,9 @@ import dev.kord.common.entity.optional.unwrap
 import dev.kord.core.Kord
 import dev.kord.core.behavior.RoleBehavior
 import dev.kord.core.cache.data.RoleData
+import dev.kord.core.hash
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
-import dev.kord.core.hash
 
 public data class Role(
     val data: RoleData,