Fix build and use K2 & Java 21

DRSchlaubi · Nov 1, 2023 · b27e72a · b27e72a
1 parent 28d4947
commit b27e72a
Show file tree

Hide file tree

Showing 50 changed files with 39 additions and 73 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ permissions: write-all
 
 jobs:
   mikbot:
-    uses: mikbot/mikbot-workflow/.github/workflows/mikbot-workflow.yml@v1.3.1
+    uses: mikbot/mikbot-workflow/.github/workflows/mikbot-workflow.yml@v1.4.0
     with:
       run-maven-publish: true
       update-binary-repository: true

diff --git a/.github/workflows/gradle_plugin_ci.yml b/.github/workflows/gradle_plugin_ci.yml
@@ -33,11 +33,11 @@ jobs:
     needs: gradleValidation
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 19
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 19
+          java-version: 21
       - name: Test with Gradle
         run: ./gradlew gradle-plugin:classes
       - name: Login to Gradle Plugin Portal

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:20-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 
 WORKDIR /usr/app
 COPY runtime/build/install/mikmusic ./

diff --git a/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/util/Confirmation.kt b/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/util/Confirmation.kt
@@ -8,7 +8,6 @@ import com.kotlindiscord.kord.extensions.modules.unsafe.annotations.UnsafeAPI
 import com.kotlindiscord.kord.extensions.modules.unsafe.contexts.UnsafeSlashCommandContext
 import com.kotlindiscord.kord.extensions.modules.unsafe.types.respondEphemeral
 import com.kotlindiscord.kord.extensions.modules.unsafe.types.respondPublic
-import com.kotlindiscord.kord.extensions.types.respond
 import com.kotlindiscord.kord.extensions.utils.waitFor
 import dev.kord.common.entity.ButtonStyle
 import dev.kord.core.behavior.interaction.followup.FollowupMessageBehavior

diff --git a/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/util/ListPaginator.kt b/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/util/ListPaginator.kt
@@ -4,8 +4,6 @@ import com.kotlindiscord.kord.extensions.pagination.builders.PaginatorBuilder
 import dev.kord.core.behavior.UserBehavior
 import dev.kord.rest.builder.message.EmbedBuilder
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.toList
 import kotlin.math.ceil
 
@@ -21,14 +19,14 @@ import kotlin.math.ceil
  * @param additionalConfig additional [PaginatorBuilder] config
  * @param additionalPageConfig additional [EmbedBuilder] config, applied to each page
  */
-public suspend fun <T> PaginatorBuilder.forList(
+public fun <T> PaginatorBuilder.forList(
     user: UserBehavior,
     items: List<T>,
     mapper: suspend (T) -> String,
     title: suspend (current: Int, total: Int) -> String,
     chunkSize: Int = 8,
     enumerate: Boolean = true,
-    additionalConfig: suspend PaginatorBuilder.() -> Unit = {},
+    additionalConfig: PaginatorBuilder.() -> Unit = {},
     additionalPageConfig: suspend EmbedBuilder.() -> Unit = {},
 ): Unit = forList(user, items.size, { offset, limit ->
     items.subList(offset, (offset + limit).coerceAtMost(items.size))
@@ -55,21 +53,31 @@ public suspend fun <T> PaginatorBuilder.forFlow(
     title: suspend (current: Int, total: Int) -> String,
     chunkSize: Int = 8,
     enumerate: Boolean = true,
-    additionalConfig: suspend PaginatorBuilder.() -> Unit = {},
+    additionalConfig: PaginatorBuilder.() -> Unit = {},
     additionalPageConfig: suspend EmbedBuilder.() -> Unit = {},
-): Unit = forList(user, total.toInt(), { offset, _ ->
-    items.drop(offset).take(chunkSize).toList()
-}, mapper, title, chunkSize, enumerate, additionalConfig, additionalPageConfig)
+) {
+    val list = items.toList()
+    forList(
+        user,
+        list,
+        mapper,
+        title,
+        chunkSize,
+        enumerate,
+        additionalConfig,
+        additionalPageConfig
+    )
+}
 
-private suspend fun <T> PaginatorBuilder.forList(
+private fun <T> PaginatorBuilder.forList(
     user: UserBehavior,
     size: Int,
-    subList: suspend (offset: Int, limit: Int) -> List<T>,
+    subList: (offset: Int, limit: Int) -> List<T>,
     mapper: suspend (T) -> String,
     title: suspend (current: Int, end: Int) -> String,
     chunkSize: Int = 8,
     enumerate: Boolean = true,
-    additionalConfig: suspend PaginatorBuilder.() -> Unit = {},
+    additionalConfig: PaginatorBuilder.() -> Unit = {},
     additionalPageConfig: suspend EmbedBuilder.() -> Unit = {},
 ) {
     owner = user
@@ -92,7 +100,7 @@ private fun <T> PaginatorBuilder.addPage(
     items: List<T>,
     enumerate: Boolean,
     mapper: suspend (T) -> String,
-    additionalPageConfig: suspend EmbedBuilder.() -> Unit
+    additionalPageConfig: suspend EmbedBuilder.() -> Unit,
 ) {
     page {
         this.title = title((myOffset + 1), pages.groups.size)

diff --git a/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/util/MessageBuilder.kt b/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/util/MessageBuilder.kt
@@ -1,7 +1,6 @@
 package dev.schlaubi.mikbot.plugin.api.util
 
 import com.kotlindiscord.kord.extensions.commands.CommandContext
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.core.behavior.interaction.followup.FollowupMessageBehavior
 import dev.kord.rest.builder.message.create.MessageCreateBuilder
 import dev.kord.rest.builder.message.modify.MessageModifyBuilder

diff --git a/buildSrc/src/main/kotlin/mikbot-module.gradle.kts b/buildSrc/src/main/kotlin/mikbot-module.gradle.kts
@@ -19,5 +19,5 @@ tasks {
 }
 
 kotlin {
-    jvmToolchain(20)
+    jvmToolchain(21)
 }
diff --git a/...e-i18n/src/main/kotlin/dev/schlaubi/mikbot/core/i18n/database/settings/LanguageCommand.kt b/...e-i18n/src/main/kotlin/dev/schlaubi/mikbot/core/i18n/database/settings/LanguageCommand.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.application.slash.converters.impl.stringChoice
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
 import com.kotlindiscord.kord.extensions.i18n.SupportedLocales
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.core.i18n.database.LangaugeUser
 import dev.schlaubi.mikbot.core.i18n.database.LanguageDatabase
 import dev.schlaubi.mikbot.plugin.api.settings.SettingsModule

diff --git a/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/DeleteCommand.kt b/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/DeleteCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikbot.core.gdpr
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.util.confirmation
 
 fun GDPRModule.deleteCommand() = ephemeralSubCommand {

diff --git a/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/InfoCommand.kt b/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/InfoCommand.kt
@@ -1,7 +1,6 @@
 package dev.schlaubi.mikbot.core.gdpr
 
 import com.kotlindiscord.kord.extensions.commands.CommandContext
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.rest.builder.message.EmbedBuilder
 import dev.kord.rest.builder.message.create.embed
 import dev.schlaubi.mikbot.core.gdpr.api.AnonymizedData

diff --git a/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/RequestCommand.kt b/core/gdpr/src/main/kotlin/dev/schlaubi/mikbot/core/gdpr/RequestCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikbot.core.gdpr
 
-import com.kotlindiscord.kord.extensions.types.editingPaginator
 import dev.kord.rest.builder.message.EmbedBuilder
 import dev.schlaubi.mikbot.plugin.api.util.effectiveAvatar
 import dev.schlaubi.stdx.core.paginate

diff --git a/core/redeploy-hook/src/main/kotlin/dev/schlaubi/mikbot/core/redeploy_hook/RedeployCommand.kt b/core/redeploy-hook/src/main/kotlin/dev/schlaubi/mikbot/core/redeploy_hook/RedeployCommand.kt
@@ -2,7 +2,6 @@ package dev.schlaubi.mikbot.core.redeploy_hook
 
 import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.core.redeploy_hook.api.RedeployExtensionPoint
 import dev.schlaubi.mikbot.plugin.api.getExtensions
 import dev.schlaubi.mikbot.plugin.api.owner.OwnerModule

diff --git a/gradle.properties b/gradle.properties
@@ -4,3 +4,4 @@ kotlin.code.style=official
 org.gradle.parallel=true
 kotlin.mpp.stability.nowarn=true
 org.gradle.caching=true
+kotlin.experimental.tryK2=true
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.1.10-SNAPSHOT"
+    version = "3.2.0-SNAPSHOT"
 }
diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/ClearCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/ClearCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikmusic.commands
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.core.MusicModule
 
 suspend fun MusicModule.clearCommand() = ephemeralControlSlashCommand {

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/FixCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/FixCommand.kt
@@ -1,7 +1,6 @@
 package dev.schlaubi.mikmusic.commands
 
 import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
-import com.kotlindiscord.kord.extensions.types.edit
 import com.kotlindiscord.kord.extensions.utils.waitFor
 import dev.kord.common.entity.ButtonStyle
 import dev.kord.common.entity.Permission

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/LycricsCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/LycricsCommand.kt
@@ -3,8 +3,6 @@ package dev.schlaubi.mikmusic.commands
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalString
 import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
-import com.kotlindiscord.kord.extensions.types.editingPaginator
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.util.forList
 import dev.schlaubi.mikmusic.checks.musicQuizAntiCheat
 import dev.schlaubi.mikmusic.core.MusicModule

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/MoveCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/MoveCommand.kt
@@ -5,7 +5,6 @@ import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSla
 import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
 import com.kotlindiscord.kord.extensions.commands.application.slash.ephemeralSubCommand
 import com.kotlindiscord.kord.extensions.commands.converters.impl.int
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.arbjerg.lavalink.protocol.v4.Track
 import dev.schlaubi.mikmusic.core.MusicModule
 

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NextCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NextCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikmusic.commands
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.checks.anyMusicPlaying
 import dev.schlaubi.mikmusic.core.MusicModule
 import dev.schlaubi.mikmusic.player.ChapterQueuedTrack

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NowPlayingCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/NowPlayingCommand.kt
@@ -3,7 +3,6 @@ package dev.schlaubi.mikmusic.commands
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalInt
 import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.rest.builder.message.create.embed
 import dev.schlaubi.mikmusic.checks.anyMusicPlaying
 import dev.schlaubi.mikmusic.checks.musicQuizAntiCheat

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/PauseCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/PauseCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikmusic.commands
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.core.MusicModule
 
 suspend fun MusicModule.pauseCommand() = ephemeralControlSlashCommand {

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/QueueCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/QueueCommand.kt
@@ -1,8 +1,6 @@
 package dev.schlaubi.mikmusic.commands
 
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.editingPaginator
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.util.forList
 import dev.schlaubi.mikmusic.checks.anyMusicPlaying
 import dev.schlaubi.mikmusic.core.MusicModule

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RemoveCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/RemoveCommand.kt
@@ -6,7 +6,6 @@ import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSla
 import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
 import com.kotlindiscord.kord.extensions.commands.application.slash.ephemeralSubCommand
 import com.kotlindiscord.kord.extensions.commands.converters.impl.int
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.common.entity.Snowflake
 import dev.schlaubi.mikbot.plugin.api.util.safeGuild
 import dev.schlaubi.mikmusic.core.MusicModule

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/ReplayCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/ReplayCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikmusic.commands
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.core.MusicModule
 
 suspend fun MusicModule.replayCommand() = ephemeralControlSlashCommand {

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SchedulerCommands.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SchedulerCommands.kt
@@ -1,7 +1,6 @@
 package dev.schlaubi.mikmusic.commands
 
 import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.core.MusicModule
 import dev.schlaubi.mikmusic.player.MusicPlayer
 import kotlin.reflect.KMutableProperty1

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SeekCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SeekCommand.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.DiscordRelayedException
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.string
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.checks.anyMusicPlaying
 import dev.schlaubi.mikmusic.core.MusicModule
 import kotlin.time.Duration.Companion.minutes

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt
@@ -2,7 +2,6 @@ package dev.schlaubi.mikmusic.commands
 
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.defaultingInt
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.core.MusicModule
 
 class SkipArguments : Arguments() {

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/StopCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/StopCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikmusic.commands
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.core.MusicModule
 
 suspend fun MusicModule.stopCommand() =

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/VolumeCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/VolumeCommand.kt
@@ -3,7 +3,6 @@ package dev.schlaubi.mikmusic.commands
 import com.kotlindiscord.kord.extensions.DiscordRelayedException
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalInt
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.core.MusicModule
 
 class VolumeArguments : Arguments() {

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt
@@ -2,8 +2,6 @@ package dev.schlaubi.mikmusic.context
 
 import com.kotlindiscord.kord.extensions.commands.application.message.EphemeralMessageCommandContext
 import com.kotlindiscord.kord.extensions.extensions.ephemeralMessageCommand
-import com.kotlindiscord.kord.extensions.types.editingPaginator
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.util.attachmentOrContentQuery
 import dev.schlaubi.mikmusic.checks.joinSameChannelCheck
 import dev.schlaubi.mikmusic.core.MusicModule

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/DjModeCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/DjModeCommand.kt
@@ -3,7 +3,6 @@ package dev.schlaubi.mikmusic.core.settings.commands
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalRole
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.settings.SettingsModule
 import dev.schlaubi.mikbot.plugin.api.settings.guildAdminOnly
 import dev.schlaubi.mikbot.plugin.api.util.safeGuild

diff --git a/.../commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/FixMusicChannel.kt b/.../commands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/FixMusicChannel.kt
@@ -1,7 +1,6 @@
 package dev.schlaubi.mikmusic.core.settings.commands
 
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.settings.SettingsModule
 import dev.schlaubi.mikbot.plugin.api.util.safeGuild
 import dev.schlaubi.mikmusic.core.settings.MusicSettingsDatabase

diff --git a/...mands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/LeaveTimeoutCommand.kt b/...mands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/LeaveTimeoutCommand.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.DiscordRelayedException
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.duration
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.settings.SettingsModule
 import dev.schlaubi.mikbot.plugin.api.settings.guildAdminOnly
 import dev.schlaubi.mikbot.plugin.api.util.safeGuild

diff --git a/.../src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SchedulerSettingsCommand.kt b/.../src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SchedulerSettingsCommand.kt
@@ -4,7 +4,6 @@ import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalInt
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikbot.plugin.api.settings.SettingsModule
 import dev.schlaubi.mikbot.plugin.api.settings.guildAdminOnly
 import dev.schlaubi.mikbot.plugin.api.util.safeGuild

diff --git a/...mands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SponsorBlockCommand.kt b/...mands/src/main/kotlin/dev/schlaubi/mikmusic/core/settings/commands/SponsorBlockCommand.kt
@@ -3,7 +3,6 @@ package dev.schlaubi.mikmusic.core.settings.commands
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalBoolean
 import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.lavakord.plugins.sponsorblock.model.Category
 import dev.schlaubi.lavakord.plugins.sponsorblock.rest.disableSponsorblock
 import dev.schlaubi.lavakord.plugins.sponsorblock.rest.putSponsorblockCategories

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt
@@ -2,7 +2,6 @@ package dev.schlaubi.mikmusic.playlist.commands
 
 import com.kotlindiscord.kord.extensions.commands.application.slash.converters.impl.optionalEnumChoice
 import com.kotlindiscord.kord.extensions.commands.converters.impl.defaultingBoolean
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.rest.builder.message.create.embed
 import dev.schlaubi.mikmusic.autocomplete.autoCompletedYouTubeQuery
 import dev.schlaubi.mikmusic.player.queue.QueueOptions

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/Common.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/Common.kt
@@ -5,7 +5,6 @@ import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.CommandContext
 import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
 import com.kotlindiscord.kord.extensions.commands.converters.impl.string
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.core.behavior.UserBehavior
 import dev.schlaubi.mikbot.plugin.api.PluginContext
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/DeleteCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/DeleteCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikmusic.playlist.commands
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.playlist.PlaylistDatabase
 
 class PlaylistDeleteArguments : PlaylistArguments()

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ListCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/ListCommand.kt
@@ -2,9 +2,7 @@ package dev.schlaubi.mikmusic.playlist.commands
 
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.impl.defaultingBoolean
-import com.kotlindiscord.kord.extensions.types.editingPaginator
-import com.kotlindiscord.kord.extensions.types.respond
-import dev.schlaubi.mikbot.plugin.api.util.forFlow
+import dev.schlaubi.mikbot.plugin.api.util.forList
 import dev.schlaubi.mikmusic.playlist.Playlist
 import dev.schlaubi.mikmusic.playlist.PlaylistDatabase
 import org.litote.kmongo.eq
@@ -38,12 +36,12 @@ fun PlaylistModule.listCommand() = ephemeralSubCommand(::PlayListListArguments)
             }
             return@action
         }
-        val playlists = PlaylistDatabase.collection.find(filter).toFlow()
+        val playlists = PlaylistDatabase.collection.find(filter).toList()
 
         val tracks = translate("music.general.tracks")
         editingPaginator {
-            forFlow(
-                user, playlistCount, playlists, { "${it.name} - ${it.songs.size} $tracks by <@${it.authorId}>" },
+            forList(
+                user, playlists, { "${it.name} - ${it.songs.size} $tracks by <@${it.authorId}>" },
                 { current, total ->
                     translate(
                         "commands.playlist.list.paginator.title",

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/LoadCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/LoadCommand.kt
@@ -1,6 +1,5 @@
 package dev.schlaubi.mikmusic.playlist.commands
 
-import com.kotlindiscord.kord.extensions.types.respond
 import dev.schlaubi.mikmusic.checks.joinSameChannelCheck
 import dev.schlaubi.mikmusic.playlist.PlaylistDatabase
 import dev.schlaubi.mikmusic.util.mapToQueuedTrack