Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix breaking changes from Kord Kotlin/JS support #211

Merged
merged 2 commits into from
Apr 5, 2023
Merged

Fix breaking changes from Kord Kotlin/JS support #211

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
946df3b
Fix breaking changes from Kord Kotlin/JS support
lukellmann Apr 5, 2023
7ef3a1f
Add translation keys
lukellmann Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions kord-extensions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ dependencies {
api(libs.koin.core)
api(libs.koin.logger)

api(libs.kord) {
capabilities {
requireCapability(libs.kord.voice.get().toString())
}
}
api(libs.kord)

api(libs.logging) // Basic logging setup
api(libs.kx.ser)
Expand Down
2 changes: 2 additions & 0 deletions ...nsions/src/main/kotlin/com/kotlindiscord/kord/extensions/builders/ExtensibleBotBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.kotlindiscord.kord.extensions.utils.getKoin
import com.kotlindiscord.kord.extensions.utils.loadModule
import dev.kord.cache.api.DataCache
import dev.kord.common.Color
import dev.kord.common.asJavaLocale
import dev.kord.common.entity.PresenceStatus
import dev.kord.common.entity.Snowflake
import dev.kord.core.ClientResources
Expand All @@ -40,6 +41,7 @@ import dev.kord.core.behavior.UserBehavior
import dev.kord.core.behavior.channel.ChannelBehavior
import dev.kord.core.builder.kord.KordBuilder
import dev.kord.core.cache.KordCacheBuilder
import dev.kord.core.cache.lruCache
import dev.kord.core.entity.interaction.Interaction
import dev.kord.core.event.message.MessageCreateEvent
import dev.kord.core.supplier.EntitySupplier
Expand Down
1 change: 1 addition & 0 deletions .../main/kotlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
import com.kotlindiscord.kord.extensions.utils.MutableStringKeyedMap
import com.kotlindiscord.kord.extensions.utils.getLocale
import dev.kord.common.asJavaLocale
import dev.kord.common.entity.ApplicationCommandType
import dev.kord.common.entity.Permission
import dev.kord.common.entity.Permissions
Expand Down
1 change: 1 addition & 0 deletions ...tlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommandRegistry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.kotlindiscord.kord.extensions.i18n.TranslationsProvider
import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
import dev.kord.common.annotation.KordExperimental
import dev.kord.common.annotation.KordUnsafe
import dev.kord.common.asJavaLocale
import dev.kord.common.entity.ApplicationCommandType
import dev.kord.common.entity.Choice
import dev.kord.common.entity.Snowflake
Expand Down
1 change: 0 additions & 1 deletion kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_ChannelType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import dev.kord.common.entity.ChannelType
import java.util.*

/** Given a [ChannelType], return a string representing its translation key. **/
@Suppress("DEPRECATION_ERROR")
public fun ChannelType.toTranslationKey(): String = when (this) {
ChannelType.DM -> "channelType.dm"
ChannelType.GroupDM -> "channelType.groupDm"
Expand Down
4 changes: 3 additions & 1 deletion kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Permissions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public fun Permission.toTranslationKey(): String? = when (this) {
Permission.EmbedLinks -> "permission.embedLinks"
Permission.KickMembers -> "permission.kickMembers"
Permission.ManageChannels -> "permission.manageChannels"
Permission.ManageEmojisAndStickers -> "permission.manageEmojisAndStickers"
Permission.ManageGuildExpressions, Permission.ManageEmojisAndStickers -> "permission.manageEmojisAndStickers"
Permission.ManageEvents -> "permission.manageEvents"
Permission.ManageGuild -> "permission.manageGuild"
Permission.ManageMessages -> "permission.manageMessages"
Expand Down Expand Up @@ -57,6 +57,8 @@ public fun Permission.toTranslationKey(): String? = when (this) {

Permission.UseExternalStickers -> "permission.useExternalStickers"
Permission.UseEmbeddedActivities -> "permission.useEmbeddedActivities"
Permission.ViewCreatorMonetizationAnalytics -> TODO()
Permission.UseSoundboard -> TODO()
lukellmann marked this conversation as resolved.
Show resolved Hide resolved

is Permission.Unknown -> null
}
Expand Down
3 changes: 1 addition & 2 deletions libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
konf-core = { module = "com.uchuhimo:konf", version.ref = "konf" }
konf-toml = { module = "com.uchuhimo:konf-toml", version.ref = "konf" }

kord = { module = "dev.kord:kord-core", version.ref = "kord" }
kord-voice = { module = "dev.kord:core-voice", version.ref = "kord" }
kord = { module = "dev.kord:kord-core-voice", version.ref = "kord" }

kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" }
Expand Down
1 change: 1 addition & 0 deletions ...src/main/kotlin/com/kotlindiscord/kord/extensions/testbot/extensions/I18nTestExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.types.respond
import dev.kord.common.asJavaLocale
import dev.kord.core.behavior.interaction.suggestString
import dev.kord.core.event.interaction.ChatInputCommandInteractionCreateEvent

Expand Down