From 61206eab904e673e57d97fc1db9a2bfa707c3d0d Mon Sep 17 00:00:00 2001 From: Michael Rittmeister Date: Wed, 25 Sep 2024 21:17:23 +0200 Subject: [PATCH] Optimize imports --- common/src/commonMain/kotlin/entity/Snowflake.kt | 1 - common/src/commonTest/kotlin/entity/MessageFlagTest.kt | 1 - common/src/commonTest/kotlin/entity/PermissionTest.kt | 1 - .../commonTest/kotlin/entity/optional/OptionalBooleanTest.kt | 1 - .../src/commonTest/kotlin/entity/optional/OptionalIntTest.kt | 1 - .../src/commonTest/kotlin/entity/optional/OptionalLongTest.kt | 1 - .../kotlin/entity/optional/OptionalSnowflakeTest.kt | 1 - common/src/commonTest/kotlin/entity/optional/OptionalTest.kt | 1 - common/src/commonTest/kotlin/json/ChannelTest.kt | 2 +- common/src/jvmTest/kotlin/ColorTestsJvm.kt | 3 +-- .../src/commonTest/kotlin/regression/CacheMissRegression.kt | 1 - core/src/commonMain/kotlin/behavior/GuildEmojiBehavior.kt | 2 +- core/src/commonMain/kotlin/behavior/MessageBehavior.kt | 3 +-- core/src/commonMain/kotlin/behavior/TemplateBehavior.kt | 2 +- core/src/commonMain/kotlin/behavior/UserBehavior.kt | 2 +- core/src/commonMain/kotlin/behavior/WebhookBehavior.kt | 2 +- .../kotlin/behavior/channel/CategorizableChannelBehavior.kt | 2 +- .../src/commonMain/kotlin/behavior/channel/ChannelBehavior.kt | 2 +- .../kotlin/behavior/channel/GuildChannelBehavior.kt | 2 +- .../kotlin/behavior/channel/MessageChannelBehavior.kt | 1 - .../commonMain/kotlin/behavior/channel/NewsChannelBehavior.kt | 1 - .../kotlin/behavior/channel/TopGuildChannelBehavior.kt | 2 +- .../kotlin/behavior/channel/VoiceChannelBehavior.kt | 2 +- .../behavior/channel/threads/ThreadParentChannelBehavior.kt | 4 ++-- .../kotlin/behavior/interaction/ActionInteractionBehavior.kt | 1 - .../behavior/interaction/ComponentInteractionBehavior.kt | 1 - .../response/DeferredEphemeralMessageInteractionBehavior.kt | 1 - .../response/EphemeralMessageInteractionResponseBehavior.kt | 1 - .../response/FollowupPermittingInteractionResponseBehavior.kt | 1 - core/src/commonMain/kotlin/builder/kord/KordProxyBuilder.kt | 1 - .../src/commonMain/kotlin/builder/kord/KordRestOnlyBuilder.kt | 1 - core/src/commonMain/kotlin/cache/data/ApplicationData.kt | 2 -- .../commonMain/kotlin/cache/data/MessageInteractionData.kt | 1 - .../commonMain/kotlin/cache/data/PermissionOverwriteData.kt | 2 +- core/src/commonMain/kotlin/entity/Emoji.kt | 2 +- core/src/commonMain/kotlin/entity/Integration.kt | 1 - core/src/commonMain/kotlin/entity/Member.kt | 2 +- core/src/commonMain/kotlin/entity/Role.kt | 2 +- core/src/commonMain/kotlin/entity/RoleTags.kt | 4 ++-- core/src/commonMain/kotlin/entity/VoiceState.kt | 1 - core/src/commonMain/kotlin/entity/Webhook.kt | 2 +- core/src/commonMain/kotlin/entity/channel/Category.kt | 2 +- core/src/commonMain/kotlin/entity/channel/NewsChannel.kt | 4 ++-- .../src/commonMain/kotlin/entity/channel/StageVoiceChannel.kt | 2 +- core/src/commonMain/kotlin/entity/channel/TextChannel.kt | 2 +- .../commonMain/kotlin/entity/interaction/ResolvedObjects.kt | 2 +- core/src/commonMain/kotlin/supplier/EntitySupplyStrategy.kt | 1 - core/src/jvmTest/kotlin/entity/IntegrationTest.kt | 2 +- core/src/jvmTest/kotlin/entity/MemberTest.kt | 2 +- .../commonMain/kotlin/builder/RequestGuildMembersBuilder.kt | 1 - .../commonMain/kotlin/builder/channel/InviteCreateBuilder.kt | 1 - .../src/commonMain/kotlin/builder/guild/EmojiModifyBuilder.kt | 2 +- .../commonMain/kotlin/builder/guild/StickerModifyBuilder.kt | 2 +- rest/src/commonMain/kotlin/builder/role/RoleCreateBuilder.kt | 1 - rest/src/commonMain/kotlin/builder/role/RoleModifyBuilder.kt | 1 - .../kotlin/builder/role/RolePositionsModifyBuilder.kt | 2 +- rest/src/commonMain/kotlin/request/KtorRequestHandler.kt | 1 - voice/src/main/java/com/iwebpp/crypto/TweetNaclFast.java | 1 - 58 files changed, 32 insertions(+), 64 deletions(-) diff --git a/common/src/commonMain/kotlin/entity/Snowflake.kt b/common/src/commonMain/kotlin/entity/Snowflake.kt index 1fcc7af932b..16f42ac8573 100644 --- 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 index 75ae4296efa..d6ec3629231 100644 --- 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 index 1eed68d0a19..87f872cc0f6 100644 --- 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 index 687a8656944..f14aa16f53d 100644 --- 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 index fcd994c462e..21416bffc2f 100644 --- 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 index f576edae6e3..4cabd5dacfe 100644 --- 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 index 2ff3cf3a409..c2768b198cf 100644 --- 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 index 25879bfaff6..18fbffeff22 100644 --- 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 index 9851007c24d..325f3260222 100644 --- 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 index c5e15b31c54..8a81fd5fec8 100644 --- 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 index ae948c06fbb..620431632c4 100644 --- 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 index d71f3aa431b..95b400432d2 100644 --- 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 index fbf1b2e01ce..7515e22b925 100644 --- 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 index 7ed3674b675..5a501f912cb 100644 --- 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 index 2d4e406d8cc..ebf3c79729a 100644 --- a/core/src/commonMain/kotlin/behavior/UserBehavior.kt +++ b/core/src/commonMain/kotlin/behavior/UserBehavior.kt @@ -8,6 +8,7 @@ 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 @@ -15,7 +16,6 @@ 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 index 9fae71abca0..6e87872b2f9 100644 --- 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 index 9b1f843ca23..c5f8d3a0f5c 100644 --- 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 index 5408d3bffc4..16a457a2693 100644 --- 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 index 63640b2ad49..3054da51ef8 100644 --- 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 index 99d36695c8f..2a29560d215 100644 --- 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 index 800896a6058..a80f1fdae8f 100644 --- 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 index ed93a4edbe7..5587f8430a2 100644 --- 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 index 0c1b1ed4874..6b98b0ed0d4 100644 --- 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 index dfe282de4f0..a686c6dd8e8 100644 --- 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 index 7824364035b..8f5e29436db 100644 --- 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 index d85521d6b84..2858e5dcc98 100644 --- 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/core/src/commonMain/kotlin/behavior/interaction/response/DeferredEphemeralMessageInteractionBehavior.kt b/core/src/commonMain/kotlin/behavior/interaction/response/DeferredEphemeralMessageInteractionBehavior.kt index 2a6526c2071..018fce5b516 100644 --- a/core/src/commonMain/kotlin/behavior/interaction/response/DeferredEphemeralMessageInteractionBehavior.kt +++ b/core/src/commonMain/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/core/src/commonMain/kotlin/behavior/interaction/response/EphemeralMessageInteractionResponseBehavior.kt b/core/src/commonMain/kotlin/behavior/interaction/response/EphemeralMessageInteractionResponseBehavior.kt index 70910b25718..c96b038238e 100644 --- a/core/src/commonMain/kotlin/behavior/interaction/response/EphemeralMessageInteractionResponseBehavior.kt +++ b/core/src/commonMain/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/core/src/commonMain/kotlin/behavior/interaction/response/FollowupPermittingInteractionResponseBehavior.kt b/core/src/commonMain/kotlin/behavior/interaction/response/FollowupPermittingInteractionResponseBehavior.kt index 50630cc4add..31481a20bfd 100644 --- a/core/src/commonMain/kotlin/behavior/interaction/response/FollowupPermittingInteractionResponseBehavior.kt +++ b/core/src/commonMain/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 index 6550afca39a..387a7c7afec 100644 --- 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 index 2a03847e162..06a1bce9789 100644 --- 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 index 86cea34c359..367134c2fbc 100644 --- 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 index 26ea9127684..21be6e0fb60 100644 --- 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 index ca4870e50eb..68aa381ba7c 100644 --- 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 index fe8b21eeb95..dc158b19a52 100644 --- 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 index 6227a3b1091..ef114fa36e9 100644 --- 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 index a37683931c2..2d1a4666807 100644 --- 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 index 7ba49e4d513..62141e86ad8 100644 --- 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, diff --git a/core/src/commonMain/kotlin/entity/RoleTags.kt b/core/src/commonMain/kotlin/entity/RoleTags.kt index 42f88fd2465..fa1b6da8341 100644 --- a/core/src/commonMain/kotlin/entity/RoleTags.kt +++ b/core/src/commonMain/kotlin/entity/RoleTags.kt @@ -1,14 +1,14 @@ package dev.kord.core.entity import dev.kord.common.entity.Snowflake +import dev.kord.common.exception.RequestException import dev.kord.core.Kord import dev.kord.core.KordObject import dev.kord.core.behavior.GuildBehavior import dev.kord.core.cache.data.IntegrationData import dev.kord.core.cache.data.RoleTagsData -import dev.kord.core.supplier.EntitySupplier -import dev.kord.common.exception.RequestException import dev.kord.core.exception.EntityNotFoundException +import dev.kord.core.supplier.EntitySupplier import dev.kord.core.supplier.EntitySupplyStrategy public class RoleTags( diff --git a/core/src/commonMain/kotlin/entity/VoiceState.kt b/core/src/commonMain/kotlin/entity/VoiceState.kt index 0c41c80410e..66924ba07f7 100644 --- a/core/src/commonMain/kotlin/entity/VoiceState.kt +++ b/core/src/commonMain/kotlin/entity/VoiceState.kt @@ -10,7 +10,6 @@ import dev.kord.core.entity.channel.VoiceChannel import dev.kord.core.exception.EntityNotFoundException import dev.kord.core.supplier.EntitySupplier import dev.kord.core.supplier.EntitySupplyStrategy -import dev.kord.core.supplier.getChannelOfOrNull import kotlinx.datetime.Instant public class VoiceState( diff --git a/core/src/commonMain/kotlin/entity/Webhook.kt b/core/src/commonMain/kotlin/entity/Webhook.kt index 2874331d505..093826d5cfd 100644 --- a/core/src/commonMain/kotlin/entity/Webhook.kt +++ b/core/src/commonMain/kotlin/entity/Webhook.kt @@ -11,11 +11,11 @@ import dev.kord.core.cache.data.WebhookData import dev.kord.core.entity.channel.MessageChannel import dev.kord.core.entity.channel.TopGuildMessageChannel 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.core.hash public data class Webhook( val data: WebhookData, diff --git a/core/src/commonMain/kotlin/entity/channel/Category.kt b/core/src/commonMain/kotlin/entity/channel/Category.kt index 76b2cdfc13e..9ea97d59a9a 100644 --- a/core/src/commonMain/kotlin/entity/channel/Category.kt +++ b/core/src/commonMain/kotlin/entity/channel/Category.kt @@ -8,9 +8,9 @@ import dev.kord.core.behavior.channel.ChannelBehavior import dev.kord.core.behavior.channel.GuildChannelBehavior import dev.kord.core.cache.data.ChannelData import dev.kord.core.entity.Entity +import dev.kord.core.hash import dev.kord.core.supplier.EntitySupplier import dev.kord.core.supplier.EntitySupplyStrategy -import dev.kord.core.hash /** * An instance of a Discord category associated to a [guild]. diff --git a/core/src/commonMain/kotlin/entity/channel/NewsChannel.kt b/core/src/commonMain/kotlin/entity/channel/NewsChannel.kt index 348edf55309..cd4b9998f4f 100644 --- a/core/src/commonMain/kotlin/entity/channel/NewsChannel.kt +++ b/core/src/commonMain/kotlin/entity/channel/NewsChannel.kt @@ -2,12 +2,12 @@ package dev.kord.core.entity.channel import dev.kord.core.Kord import dev.kord.core.behavior.channel.ChannelBehavior -import dev.kord.core.behavior.channel.TopGuildChannelBehavior import dev.kord.core.behavior.channel.NewsChannelBehavior +import dev.kord.core.behavior.channel.TopGuildChannelBehavior import dev.kord.core.cache.data.ChannelData +import dev.kord.core.hash import dev.kord.core.supplier.EntitySupplier import dev.kord.core.supplier.EntitySupplyStrategy -import dev.kord.core.hash /** * An instance of a Discord News Channel associated to a guild. diff --git a/core/src/commonMain/kotlin/entity/channel/StageVoiceChannel.kt b/core/src/commonMain/kotlin/entity/channel/StageVoiceChannel.kt index 4ff86c95a68..ff3e3002b46 100644 --- a/core/src/commonMain/kotlin/entity/channel/StageVoiceChannel.kt +++ b/core/src/commonMain/kotlin/entity/channel/StageVoiceChannel.kt @@ -6,9 +6,9 @@ import dev.kord.core.behavior.channel.ChannelBehavior import dev.kord.core.behavior.channel.GuildChannelBehavior import dev.kord.core.behavior.channel.StageChannelBehavior import dev.kord.core.cache.data.ChannelData +import dev.kord.core.hash import dev.kord.core.supplier.EntitySupplier import dev.kord.core.supplier.EntitySupplyStrategy -import dev.kord.core.hash /** * An instance of a [Discord Stage Channel](https://support.discord.com/hc/en-us/articles/1500005513722) diff --git a/core/src/commonMain/kotlin/entity/channel/TextChannel.kt b/core/src/commonMain/kotlin/entity/channel/TextChannel.kt index ed37d7925ee..406b79b7c74 100644 --- a/core/src/commonMain/kotlin/entity/channel/TextChannel.kt +++ b/core/src/commonMain/kotlin/entity/channel/TextChannel.kt @@ -7,9 +7,9 @@ import dev.kord.core.behavior.channel.ChannelBehavior import dev.kord.core.behavior.channel.GuildChannelBehavior import dev.kord.core.behavior.channel.TextChannelBehavior import dev.kord.core.cache.data.ChannelData +import dev.kord.core.hash import dev.kord.core.supplier.EntitySupplier import dev.kord.core.supplier.EntitySupplyStrategy -import dev.kord.core.hash import kotlin.time.Duration /** diff --git a/core/src/commonMain/kotlin/entity/interaction/ResolvedObjects.kt b/core/src/commonMain/kotlin/entity/interaction/ResolvedObjects.kt index 3cc16f84b4f..304403f89c3 100644 --- a/core/src/commonMain/kotlin/entity/interaction/ResolvedObjects.kt +++ b/core/src/commonMain/kotlin/entity/interaction/ResolvedObjects.kt @@ -1,12 +1,12 @@ package dev.kord.core.entity.interaction import dev.kord.common.entity.Snowflake +import dev.kord.common.entity.optional.mapValues import dev.kord.core.Kord import dev.kord.core.cache.data.ResolvedObjectsData import dev.kord.core.entity.* import dev.kord.core.entity.channel.ResolvedChannel import dev.kord.core.supplier.EntitySupplyStrategy -import dev.kord.common.entity.optional.mapValues public class ResolvedObjects( public val data: ResolvedObjectsData, diff --git a/core/src/commonMain/kotlin/supplier/EntitySupplyStrategy.kt b/core/src/commonMain/kotlin/supplier/EntitySupplyStrategy.kt index f7f6b6313db..b9253e6f018 100644 --- a/core/src/commonMain/kotlin/supplier/EntitySupplyStrategy.kt +++ b/core/src/commonMain/kotlin/supplier/EntitySupplyStrategy.kt @@ -1,7 +1,6 @@ package dev.kord.core.supplier import dev.kord.core.Kord -import dev.kord.core.supplier.EntitySupplyStrategy.Companion.cache /** * A supplier that accepts a [Kord] instance and returns an [EntitySupplier] of type [T]. diff --git a/core/src/jvmTest/kotlin/entity/IntegrationTest.kt b/core/src/jvmTest/kotlin/entity/IntegrationTest.kt index 37dd58a0862..10ed31d4f16 100644 --- a/core/src/jvmTest/kotlin/entity/IntegrationTest.kt +++ b/core/src/jvmTest/kotlin/entity/IntegrationTest.kt @@ -2,9 +2,9 @@ package dev.kord.core.entity import dev.kord.core.cache.data.IntegrationData import dev.kord.core.equality.GuildEntityEqualityTest +import dev.kord.core.mockKord import io.mockk.every import io.mockk.mockk -import dev.kord.core.mockKord internal class IntegrationTest : GuildEntityEqualityTest by GuildEntityEqualityTest ({ id, guildId -> val kord = mockKord() diff --git a/core/src/jvmTest/kotlin/entity/MemberTest.kt b/core/src/jvmTest/kotlin/entity/MemberTest.kt index 6fff9f80dbd..58c0ce4c67e 100644 --- a/core/src/jvmTest/kotlin/entity/MemberTest.kt +++ b/core/src/jvmTest/kotlin/entity/MemberTest.kt @@ -6,9 +6,9 @@ import dev.kord.core.cache.data.MemberData import dev.kord.core.cache.data.UserData import dev.kord.core.equality.BehaviorEqualityTest import dev.kord.core.equality.GuildEntityEqualityTest +import dev.kord.core.mockKord import io.mockk.every import io.mockk.mockk -import dev.kord.core.mockKord import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/gateway/src/commonMain/kotlin/builder/RequestGuildMembersBuilder.kt b/gateway/src/commonMain/kotlin/builder/RequestGuildMembersBuilder.kt index 0fab2d30788..2ce5b25400b 100644 --- a/gateway/src/commonMain/kotlin/builder/RequestGuildMembersBuilder.kt +++ b/gateway/src/commonMain/kotlin/builder/RequestGuildMembersBuilder.kt @@ -7,7 +7,6 @@ import dev.kord.common.entity.optional.OptionalBoolean import dev.kord.common.entity.optional.OptionalInt import dev.kord.common.entity.optional.delegate.delegate import dev.kord.gateway.GuildMembersChunkData -import dev.kord.gateway.Intent import dev.kord.gateway.PrivilegedIntent import dev.kord.gateway.RequestGuildMembers diff --git a/rest/src/commonMain/kotlin/builder/channel/InviteCreateBuilder.kt b/rest/src/commonMain/kotlin/builder/channel/InviteCreateBuilder.kt index 994e3b61650..52b75199eaa 100644 --- a/rest/src/commonMain/kotlin/builder/channel/InviteCreateBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/channel/InviteCreateBuilder.kt @@ -1,7 +1,6 @@ package dev.kord.rest.builder.channel import dev.kord.common.annotation.KordDsl -import dev.kord.common.entity.ApplicationFlag import dev.kord.common.entity.InviteTargetType import dev.kord.common.entity.Snowflake import dev.kord.common.entity.optional.* diff --git a/rest/src/commonMain/kotlin/builder/guild/EmojiModifyBuilder.kt b/rest/src/commonMain/kotlin/builder/guild/EmojiModifyBuilder.kt index 3a3aad2f695..37cdce7560f 100644 --- a/rest/src/commonMain/kotlin/builder/guild/EmojiModifyBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/guild/EmojiModifyBuilder.kt @@ -1,10 +1,10 @@ package dev.kord.rest.builder.guild -import dev.kord.rest.builder.AuditRequestBuilder import dev.kord.common.annotation.KordDsl import dev.kord.common.entity.Snowflake import dev.kord.common.entity.optional.Optional import dev.kord.common.entity.optional.delegate.delegate +import dev.kord.rest.builder.AuditRequestBuilder import dev.kord.rest.json.request.EmojiModifyRequest @KordDsl diff --git a/rest/src/commonMain/kotlin/builder/guild/StickerModifyBuilder.kt b/rest/src/commonMain/kotlin/builder/guild/StickerModifyBuilder.kt index 3e3cfb7d128..3fa51da5246 100644 --- a/rest/src/commonMain/kotlin/builder/guild/StickerModifyBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/guild/StickerModifyBuilder.kt @@ -2,9 +2,9 @@ package dev.kord.rest.builder.guild import dev.kord.common.annotation.KordDsl import dev.kord.common.entity.optional.Optional +import dev.kord.common.entity.optional.delegate.delegate import dev.kord.rest.builder.RequestBuilder import dev.kord.rest.json.request.GuildStickerModifyRequest -import dev.kord.common.entity.optional.delegate.delegate @KordDsl public class StickerModifyBuilder : RequestBuilder { diff --git a/rest/src/commonMain/kotlin/builder/role/RoleCreateBuilder.kt b/rest/src/commonMain/kotlin/builder/role/RoleCreateBuilder.kt index 1dd3079941f..6cc157db773 100644 --- a/rest/src/commonMain/kotlin/builder/role/RoleCreateBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/role/RoleCreateBuilder.kt @@ -2,7 +2,6 @@ package dev.kord.rest.builder.role import dev.kord.common.Color import dev.kord.common.annotation.KordDsl -import dev.kord.common.entity.GuildFeature import dev.kord.common.entity.Permissions import dev.kord.common.entity.optional.Optional import dev.kord.common.entity.optional.OptionalBoolean diff --git a/rest/src/commonMain/kotlin/builder/role/RoleModifyBuilder.kt b/rest/src/commonMain/kotlin/builder/role/RoleModifyBuilder.kt index 72632f517d4..263ffadaa3f 100644 --- a/rest/src/commonMain/kotlin/builder/role/RoleModifyBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/role/RoleModifyBuilder.kt @@ -2,7 +2,6 @@ package dev.kord.rest.builder.role import dev.kord.common.Color import dev.kord.common.annotation.KordDsl -import dev.kord.common.entity.GuildFeature import dev.kord.common.entity.Permissions import dev.kord.common.entity.optional.Optional import dev.kord.common.entity.optional.OptionalBoolean diff --git a/rest/src/commonMain/kotlin/builder/role/RolePositionsModifyBuilder.kt b/rest/src/commonMain/kotlin/builder/role/RolePositionsModifyBuilder.kt index 96206f8133d..47c75aac906 100644 --- a/rest/src/commonMain/kotlin/builder/role/RolePositionsModifyBuilder.kt +++ b/rest/src/commonMain/kotlin/builder/role/RolePositionsModifyBuilder.kt @@ -1,8 +1,8 @@ package dev.kord.rest.builder.role -import dev.kord.rest.builder.AuditRequestBuilder import dev.kord.common.annotation.KordDsl import dev.kord.common.entity.Snowflake +import dev.kord.rest.builder.AuditRequestBuilder import dev.kord.rest.json.request.GuildRolePositionModifyRequest @KordDsl diff --git a/rest/src/commonMain/kotlin/request/KtorRequestHandler.kt b/rest/src/commonMain/kotlin/request/KtorRequestHandler.kt index f40480c32c4..e94d947ef48 100644 --- a/rest/src/commonMain/kotlin/request/KtorRequestHandler.kt +++ b/rest/src/commonMain/kotlin/request/KtorRequestHandler.kt @@ -9,7 +9,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.TextContent import io.ktor.http.* import io.ktor.http.content.* import kotlinx.datetime.Clock diff --git a/voice/src/main/java/com/iwebpp/crypto/TweetNaclFast.java b/voice/src/main/java/com/iwebpp/crypto/TweetNaclFast.java index c3106669fcc..156ecdb6de8 100644 --- a/voice/src/main/java/com/iwebpp/crypto/TweetNaclFast.java +++ b/voice/src/main/java/com/iwebpp/crypto/TweetNaclFast.java @@ -5,7 +5,6 @@ import java.io.UnsupportedEncodingException; import java.security.SecureRandom; -import java.lang.System; import java.util.concurrent.atomic.AtomicLong;