Update Discord Frameworks to intent-compatible versions and adapt integ tests

Author: Vampire

buildSrc/src/main/kotlin/net/kautler/versions.gradle.kts

@@ -37,8 +37,8 @@ repositories {
 }
 
 val messageFrameworkVersions by extra(mapOf(
-        "javacord" to listOf("3.0.5"),
-        "jda" to listOf("4.0.0_52")
+        "javacord" to listOf("3.1.1"),
+        "jda" to listOf("4.2.0_214")
 ))
 
 val versions by extra(mapOf(

examples/simplePingBotJda/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     runtimeOnly("org.jboss.weld.se:weld-se-core:3.1.2.Final") { because("CDI implementation") }
     runtimeOnly("org.jboss:jandex:2.1.1.Final") { because("faster CDI bean scanning") }
 
-    implementation("net.dv8tion:JDA:4.0.0_52") {
+    implementation("net.dv8tion:JDA:4.2.0_214") {
         exclude("club.minnced", "opus-java")
         exclude("com.google.code.findbugs", "jsr305")
     }

examples/simplePingBotJda/src/main/java/net/kautler/command/example/ping/JdaProducer.java

@@ -40,7 +40,8 @@ public class JdaProducer {
     @ApplicationScoped
     private JDA produceJda() {
         try {
-            return new JDABuilder(discordToken)
+            return JDABuilder
+                    .createLight(discordToken)
                     .build()
                     .awaitReady();
         } catch (InterruptedException | LoginException e) {

src/javacordIntegTest/groovy/net/kautler/command/integ/test/javacord/restriction/RoleJavacordIntegTest.groovy

@@ -76,6 +76,8 @@ class RoleJavacordIntegTest extends Specification {
                 roleReceived.set(true)
             }
 
+            roleReceived.get()
+
             return role
         } finally {
             listenerManager?.remove()
@@ -95,6 +97,8 @@ class RoleJavacordIntegTest extends Specification {
             }
 
             role.addUser(user).join()
+
+            rolesUpdateReceived.get()
         } finally {
             listenerManager?.remove()
         }
@@ -119,6 +123,8 @@ class RoleJavacordIntegTest extends Specification {
             serverAsBot
                     .reorderRoles([lowerRole, middleRole, higherRole])
                     .join()
+
+            rolesUpdateReceived.get()
         } finally {
             listenerManager?.remove()
         }

src/javacordIntegTest/groovy/net/kautler/command/integ/test/javacord/restriction/ServerOwnerJavacordIntegTest.groovy

@@ -66,7 +66,7 @@ class ServerOwnerJavacordIntegTest extends Specification {
             ]
 
         when:
-            def owner = serverTextChannelAsBot.server.owner
+            def owner = serverTextChannelAsBot.server.owner.get()
             def commandReceived = new BlockingVariable<Boolean>(System.properties.testManualCommandTimeout as double)
             listenerManagers << owner.addMessageCreateListener {
                 if ((it.channel == serverTextChannelAsBot) && (it.message.content == "!ping $random")) {

src/javacordIntegTest/groovy/net/kautler/command/integ/test/javacord/spock/JavacordExtension.groovy

@@ -31,6 +31,7 @@ import javax.enterprise.inject.Produces
 import static java.lang.Boolean.FALSE
 import static java.lang.System.arraycopy
 import static java.util.UUID.randomUUID
+import static org.javacord.api.entity.intent.Intent.GUILDS
 import static org.javacord.api.entity.permission.PermissionType.ADMINISTRATOR
 
 @ApplicationScoped
@@ -49,6 +50,7 @@ class JavacordExtension implements IGlobalExtension {
     void start() {
         botDiscordApi = new DiscordApiBuilder()
                 .setToken(System.properties.testDiscordToken1)
+                .setAllIntents()
                 .login()
                 .join()
 
@@ -60,6 +62,7 @@ class JavacordExtension implements IGlobalExtension {
 
         userDiscordApi = new DiscordApiBuilder()
                 .setToken(System.properties.testDiscordToken2)
+                .setIntents(GUILDS)
                 .login()
                 .join()
 

src/jdaIntegTest/groovy/net/kautler/command/integ/test/jda/restriction/RoleJdaIntegTest.groovy

@@ -78,6 +78,8 @@ class RoleJdaIntegTest extends Specification {
                 roleReceived.set(true)
             }
 
+            roleReceived.get()
+
             return role
         } finally {
             if (eventListener) {
@@ -103,8 +105,10 @@ class RoleJdaIntegTest extends Specification {
 
             role
                     .guild
-                    .addRoleToMember(role.guild.getMember(user), role)
+                    .addRoleToMember(role.guild.retrieveMember(user).complete(), role)
                     .complete()
+
+            rolesUpdateReceived.get()
         } finally {
             if (eventListener) {
                 role.JDA.removeEventListener(eventListener)
@@ -182,6 +186,8 @@ class RoleJdaIntegTest extends Specification {
                         }
                     }
                     .complete()
+
+            rolesUpdateReceived.get()
         } finally {
             if (eventListener) {
                 guildAsBot.JDA.removeEventListener(eventListener)

src/jdaIntegTest/groovy/net/kautler/command/integ/test/jda/spock/JdaExtension.groovy

@@ -23,6 +23,7 @@ import net.dv8tion.jda.api.entities.TextChannel
 import net.dv8tion.jda.api.events.channel.text.TextChannelCreateEvent
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent
 import net.dv8tion.jda.api.hooks.EventListener
+import net.dv8tion.jda.api.requests.GatewayIntent
 import org.spockframework.runtime.extension.IGlobalExtension
 import org.spockframework.runtime.model.SpecInfo
 import spock.util.concurrent.BlockingVariable
@@ -49,7 +50,8 @@ class JdaExtension implements IGlobalExtension {
 
     @Override
     void start() {
-        botJda = new JDABuilder(System.properties.testDiscordToken1)
+        botJda = JDABuilder
+                .create(System.properties.testDiscordToken1, GatewayIntent.values() as Collection)
                 .build()
                 .awaitReady()
 
@@ -60,7 +62,8 @@ class JdaExtension implements IGlobalExtension {
             new IllegalArgumentException('Bot with testDiscordToken1 is not a member of guild testDiscordServerId')
         }
 
-        userJda = new JDABuilder(System.properties.testDiscordToken2)
+        userJda = JDABuilder
+                .createLight(System.properties.testDiscordToken2, [])
                 .build()
                 .awaitReady()
 
@@ -75,7 +78,7 @@ class JdaExtension implements IGlobalExtension {
             throw new IllegalArgumentException('Bot with testDiscordToken1 must have ADMINISTRATOR permission')
         }
 
-        def userRoles = guildAsBot.getMember(userJda.selfUser).roles
+        def userRoles = guildAsBot.retrieveMember(userJda.selfUser).complete().roles
         if (!userRoles.empty && (guildAsBot.selfMember.roles.first() <= userRoles.first())) {
             throw new IllegalArgumentException('Bot with testDiscordToken1 must have higher role than highest role of bot with testDiscordToken2')
         }
@@ -110,18 +113,18 @@ class JdaExtension implements IGlobalExtension {
             def rolesUpdateReceived = new BlockingVariable<Boolean>(System.properties.testResponseTimeout as double)
             EventListener eventListener = {
                 if ((it instanceof GuildMemberRoleRemoveEvent) &&
-                        guildAsBot.getMember(userJda.selfUser).roles.empty) {
+                        guildAsBot.retrieveMember(userJda.selfUser).complete().roles.empty) {
                     rolesUpdateReceived.set(true)
                 }
             }
             botJda.addEventListener(eventListener)
             try {
-                if (guildAsBot.getMember(userJda.selfUser).roles.empty) {
+                if (guildAsBot.retrieveMember(userJda.selfUser).complete().roles.empty) {
                     rolesUpdateReceived.set(true)
                 }
 
                 guildAsBot
-                        .modifyMemberRoles(guildAsBot.getMember(userJda.selfUser))
+                        .modifyMemberRoles(guildAsBot.retrieveMember(userJda.selfUser).complete())
                         .complete()
 
                 rolesUpdateReceived.get()