Update Kotlin and JDA

Author: zachbr

build.gradle.kts

@@ -5,9 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    // Kotlin 2.1.20 causes build failures on riscv64 and other archs
-    // see GH-86.
-    kotlin("jvm") version "2.1.10"
+    kotlin("jvm") version "2.1.21"
 
     id("org.cadixdev.licenser") version "0.6.1"
     id("com.gradleup.shadow") version "8.3.5"
@@ -27,7 +25,7 @@ repositories {
 dependencies {
     implementation("org.kitteh.irc:client-lib:9.0.0")
     implementation("club.minnced:discord-webhooks:0.8.4")
-    implementation("net.dv8tion:JDA:5.6.1") {
+    implementation("net.dv8tion:JDA:6.0.0") {
         exclude(module = "opus-java")
         exclude(module = "tink")
     }

src/main/kotlin/io/zachbr/dis4irc/bridge/command/executors/PinnedMessagesCommand.kt

@@ -23,17 +23,23 @@ class PinnedMessagesCommand(private val bridge: Bridge) : Executor {
         }
 
         val mappedChannel = bridge.channelMappings.getMappingFor(command.source) ?: throw IllegalStateException("No mapping for source channel: ${command.source}?!?")
-        val pinnedMessages = bridge.discordConn.getPinnedMessages(mappedChannel) ?: return null
         // TODO add max limit (10 most recent?), flood concerns, UX spam, opinionated
-        for (msg in pinnedMessages) {
-            bridge.mutatorManager.applyMutator(TranslateFormatting::class.java, msg)
-            val senderInfo = IrcMessageFormatter.createSenderPrefix(msg.sender, bridge.config.irc.antiPing, bridge.config.irc.useNickNameColor)
-            var msgContent = msg.contents
-            if (msg.attachments.isNotEmpty()) {
-                msg.attachments.forEach { msgContent += " $it"}
+        val pinnedMessages = bridge.discordConn.getPinnedMessages(mappedChannel) { pinned ->
+            if (pinned == null) {
+                bridge.ircConn.sendNotice(command.sender.displayName, "There are no pinned messages for ${command.source.channelName}.")
+                return@getPinnedMessages
             }
 
-            bridge.ircConn.sendNotice(command.sender.displayName, "$senderInfo $msgContent")
+            for (msg in pinned) {
+                bridge.mutatorManager.applyMutator(TranslateFormatting::class.java, msg)
+                val senderInfo = IrcMessageFormatter.createSenderPrefix(msg.sender, bridge.config.irc.antiPing, bridge.config.irc.useNickNameColor)
+                var msgContent = msg.contents
+                if (msg.attachments.isNotEmpty()) {
+                    msg.attachments.forEach { msgContent += " $it"}
+                }
+
+                bridge.ircConn.sendNotice(command.sender.displayName, "$senderInfo $msgContent")
+            }
         }
 
         return null // don't send a message publicly

src/main/kotlin/io/zachbr/dis4irc/bridge/pier/discord/DiscordPier.kt

@@ -30,6 +30,7 @@ import net.dv8tion.jda.api.entities.Guild
 import net.dv8tion.jda.api.entities.Member
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel
 import net.dv8tion.jda.api.requests.GatewayIntent
+import net.dv8tion.jda.api.requests.restaction.pagination.PinnedMessagePaginationAction
 import net.dv8tion.jda.api.utils.MemberCachePolicy
 import net.dv8tion.jda.api.utils.cache.CacheFlag
 import org.slf4j.Logger
@@ -46,7 +47,7 @@ class DiscordPier(private val bridge: Bridge) : Pier {
     override fun start() {
         logger.info("Connecting to Discord API...")
 
-        val intents = listOf(GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_EMOJIS_AND_STICKERS, GatewayIntent.MESSAGE_CONTENT)
+        val intents = listOf(GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_EXPRESSIONS, GatewayIntent.MESSAGE_CONTENT)
         val discordApiBuilder = JDABuilder.createLight(bridge.config.discord.apiKey, intents)
             .setMemberCachePolicy(MemberCachePolicy.ALL) // so we can cache invisible members and ping people not online
             .enableCache(CacheFlag.EMOJI, CacheFlag.STICKER)
@@ -234,11 +235,13 @@ class DiscordPier(private val bridge: Bridge) : Pier {
     /**
      * Gets the pinned messages from the specified discord channel or null if the channel cannot be found
      */
-    fun getPinnedMessages(channelId: String): List<DiscordMessage>? {
-        val channel = getTextChannelBy(channelId) ?: return null
-        val messages = channel.retrievePinnedMessages().complete()
-
-        return messages.map { it.toPlatformMessage(logger) }.toList()
+    fun getPinnedMessages(channelId: String, callback: (List<DiscordMessage>?) -> Unit) {
+        getTextChannelBy(channelId)?.let { channel ->
+            channel.retrievePinnedMessages().queue { pinnedMessages ->
+                val platformMessages = pinnedMessages.map { it.message.toPlatformMessage(logger) }
+                callback(platformMessages)
+            }
+        } ?: callback(null)
     }
 
     /**