Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package at.xirado.jdui.component.message

import at.xirado.jdui.component.StatefulActionComponent
import at.xirado.jdui.component.StatelessComponent
import net.dv8tion.jda.api.components.button.ButtonStyle
import net.dv8tion.jda.api.components.buttons.ButtonStyle
import net.dv8tion.jda.api.entities.emoji.Emoji
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent
import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent
import kotlin.reflect.typeOf
import net.dv8tion.jda.api.components.button.Button as JDAButton
import net.dv8tion.jda.api.components.buttons.Button as JDAButton

class ActionButton(
var style: ButtonStyle,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package at.xirado.jdui.component.message

import at.xirado.jdui.component.StatefulActionComponent
import net.dv8tion.jda.api.components.selects.SelectOption
import net.dv8tion.jda.api.components.selections.SelectOption
import net.dv8tion.jda.api.entities.channel.ChannelType
import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent
import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent
import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent
import kotlin.reflect.typeOf
import net.dv8tion.jda.api.components.selects.EntitySelectMenu as JDAEntitySelectMenu
import net.dv8tion.jda.api.components.selects.StringSelectMenu as JDAStringSelectMenu
import net.dv8tion.jda.api.components.selections.EntitySelectMenu as JDAEntitySelectMenu
import net.dv8tion.jda.api.components.selections.StringSelectMenu as JDAStringSelectMenu

private typealias StringCallback = suspend StringSelectInteractionEvent.() -> Unit
private typealias EntityCallback = suspend EntitySelectInteractionEvent.() -> Unit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class TextDisplay(
var content: String
) : StatelessComponent<JDATextDisplay>() {
override fun buildComponent(uniqueId: Int): JDATextDisplay {
return JDATextDisplay.create(content).withUniqueId(uniqueId)
return JDATextDisplay.of(content).withUniqueId(uniqueId)
}

override val type = typeOf<JDATextDisplay>()
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/kotlin/at/xirado/jdui/utils/JDA.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package at.xirado.jdui.utils
import net.dv8tion.jda.api.components.ActionComponent
import net.dv8tion.jda.api.components.Component
import net.dv8tion.jda.api.components.actionrow.ActionRow
import net.dv8tion.jda.api.components.button.Button
import net.dv8tion.jda.api.components.buttons.Button
import net.dv8tion.jda.api.components.container.Container
import net.dv8tion.jda.api.components.section.Section

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream
import net.dv8tion.jda.api.components.button.ButtonStyle.SECONDARY
import net.dv8tion.jda.api.components.buttons.ButtonStyle.SECONDARY
import net.dv8tion.jda.api.components.mediagallery.MediaGalleryItem
import okhttp3.OkHttpClient
import okhttp3.Request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import at.xirado.jdui.component.message.*
import at.xirado.jdui.component.row
import at.xirado.jdui.state.state
import at.xirado.jdui.view.definition.function.view
import net.dv8tion.jda.api.components.button.ButtonStyle
import net.dv8tion.jda.api.components.buttons.ButtonStyle
import net.dv8tion.jda.api.components.mediagallery.MediaGalleryItem
import net.dv8tion.jda.api.components.selects.EntitySelectMenu
import net.dv8tion.jda.api.components.selects.SelectOption
import net.dv8tion.jda.api.components.selections.EntitySelectMenu
import net.dv8tion.jda.api.components.selections.SelectOption
import net.dv8tion.jda.api.entities.emoji.Emoji
import net.dv8tion.jda.api.utils.FileUpload

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import at.xirado.jdui.component.row
import at.xirado.jdui.state.state
import at.xirado.jdui.view.definition.function.view
import kotlinx.serialization.Serializable
import net.dv8tion.jda.api.components.button.ButtonStyle
import net.dv8tion.jda.api.components.buttons.ButtonStyle

@Serializable
data class LastUpdate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import at.xirado.jdui.view.View
import at.xirado.jdui.view.compose
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import net.dv8tion.jda.api.components.button.ButtonStyle
import net.dv8tion.jda.api.components.buttons.ButtonStyle
import net.dv8tion.jda.api.entities.emoji.Emoji
import net.dv8tion.jda.api.utils.TimeFormat

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import at.xirado.jdui.component.message.text
import at.xirado.jdui.component.row
import at.xirado.jdui.state.state
import at.xirado.jdui.view.definition.function.view
import net.dv8tion.jda.api.components.button.ButtonStyle.*
import net.dv8tion.jda.api.components.buttons.ButtonStyle.*

fun stateTest() = view {
var someInt by state(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import dev.minn.jda.ktx.util.await
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import net.dv8tion.jda.api.components.button.ButtonStyle
import net.dv8tion.jda.api.components.buttons.ButtonStyle
import net.dv8tion.jda.api.components.separator.Separator
import net.dv8tion.jda.api.entities.emoji.Emoji
import net.dv8tion.jda.api.utils.TimeFormat
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publishing = "0.31.0"
kotlin-coroutines = "1.10.1"
kotlin-protobuf = "1.8.1"

jda = "54038f1cec"
jda = "6.0.0-rc.1"
slf4j-api = "2.0.13"
kotlin-logging = "5.1.0"
snowflake-id = "0.0.2"
Expand All @@ -19,7 +19,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

jda = { module = "io.github.freya022:JDA", version.ref = "jda" }
jda = { module = "net.dv8tion:JDA", version.ref = "jda" }
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j-api" }
kotlin-logging = { module = "io.github.oshai:kotlin-logging-jvm", version.ref = "kotlin-logging" }
snowflake = { module = "de.mkammerer.snowflake-id:snowflake-id", version.ref = "snowflake-id" }
Expand Down
Loading