Merge branch 'discord-jda:master' into master

Author: dima-dencep

.github/workflows/validate.yml

@@ -20,3 +20,21 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Build and test
         run: ./gradlew --build-cache --parallel build test
+      - name: Upload JUnit XML Test Report
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+            name: junit-xml-test-report
+            path: build/test-results/test
+      - name: Upload HTML Test Report
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+            name: junit-html-test-report
+            path: build/reports/tests/test
+      - name: Annotate Failed Tests
+        uses: mikepenz/action-junit-report@v5
+        if: ${{ !cancelled() }}
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'
+          annotate_only: 'true'

build.gradle.kts

@@ -47,7 +47,7 @@ plugins {
 ////////////////////////////////////
 
 projectEnvironment {
-    version = Version(major = "6", minor = "0", revision = "0", classifier = "rc.1")
+    version = Version(major = "6", minor = "0", revision = "0", classifier = "rc.3")
 }
 
 artifactFilters {
@@ -90,6 +90,8 @@ configure<SourceSetContainer> {
 //                                //
 ////////////////////////////////////
 
+val mockitoAgent by configurations.creating
+
 repositories {
     mavenCentral()
 }
@@ -143,6 +145,10 @@ dependencies {
     testImplementation(libs.logback.classic)
     testImplementation(libs.archunit)
 
+    mockitoAgent(libs.mockito) {
+        isTransitive = false
+    }
+
     // OpenRewrite
     // Import Rewrite's bill of materials.
     testImplementation(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.6.1"))
@@ -318,17 +324,15 @@ tasks.withType<JavaCompile> {
         args.add("8")
     }
 
-    doFirst {
-        options.compilerArgs = args
-    }
+    options.compilerArgs.addAll(args)
 }
 
-val compileJava by tasks.getting(JavaCompile::class) {
+tasks.named<JavaCompile>("compileJava").configure {
     dependsOn(generateJavaSources)
     source = generateJavaSources.get().source
 }
 
-val build by tasks.getting(Task::class) {
+tasks.build.configure {
     dependsOn(jar)
     dependsOn(javadocJar)
     dependsOn(sourcesJar)
@@ -340,6 +344,14 @@ val build by tasks.getting(Task::class) {
     shadowJar.mustRunAfter(sourcesJar)
 }
 
+
+////////////////////////////////////
+//                                //
+//       Test Configuration       //
+//                                //
+////////////////////////////////////
+
+
 val downloadRecipeClasspath by tasks.registering(Download::class) {
     val targetVersion = "5.6.1"
     src("https://repo.maven.apache.org/maven2/net/dv8tion/JDA/$targetVersion/JDA-$targetVersion.jar")
@@ -351,18 +363,37 @@ tasks.named("processTestResources").configure {
     dependsOn(downloadRecipeClasspath)
 }
 
-val test by tasks.getting(Test::class) {
+
+tasks.register<Test>("updateTestSnapshots") {
+    group = "verification"
     useJUnitPlatform()
-    failFast = false
+
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    systemProperty("updateSnapshots", "true")
 }
 
-val updateTestSnapshots by tasks.registering(Test::class) {
+tasks.withType<Test>().configureEach {
     useJUnitPlatform()
     failFast = false
 
-    systemProperty("updateSnapshots", "true")
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
+        jvmArgs = listOf("-javaagent:${mockitoAgent.asPath}")
+    }
 }
 
+tasks.test {
+    testLogging {
+        events("passed", "skipped", "failed")
+    }
+    reports {
+        junitXml.required = projectEnvironment.isGithubAction
+        html.required = projectEnvironment.isGithubAction
+    }
+}
+
+
 ////////////////////////////////////
 //                                //
 //    Publishing And Signing      //

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -789,7 +789,7 @@ default CommandCreateAction upsertCommand(@Nonnull String name, @Nonnull String
      * jda.updateCommands()
      *   .addCommands(Commands.slash("ping", "Gives the current ping"))
      *   .addCommands(Commands.slash("ban", "Ban the target user")
-     *     .setGuildOnly(true)
+     *     .setContexts(InteractionContextType.GUILD)
      *     .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.BAN_MEMBERS))
      *     .addOption(OptionType.USER, "user", "The user to ban", true))
      *   .queue();
@@ -917,59 +917,6 @@ default RestAction<Void> deleteCommandById(long commandId)
     @CheckReturnValue
     RestAction<List<RoleConnectionMetadata>> updateRoleConnectionMetadata(@Nonnull Collection<? extends RoleConnectionMetadata> records);
 
-    /**
-     * Constructs a new {@link Guild Guild} with the specified name
-     * <br>Use the returned {@link GuildAction GuildAction} to provide
-     * further details and settings for the resulting Guild!
-     *
-     * <p>This RestAction does not provide the resulting Guild!
-     * It will be in a following {@link net.dv8tion.jda.api.events.guild.GuildJoinEvent GuildJoinEvent}.
-     *
-     * @param  name
-     *         The name of the resulting guild
-     *
-     * @throws java.lang.IllegalStateException
-     *         If the currently logged in account is in 10 or more guilds
-     * @throws java.lang.IllegalArgumentException
-     *         If the provided name is empty, {@code null} or not between 2-100 characters
-     *
-     * @return {@link GuildAction GuildAction}
-     *         <br>Allows for setting various details for the resulting Guild
-     */
-    @Nonnull
-    @CheckReturnValue
-    GuildAction createGuild(@Nonnull String name);
-
-    /**
-     * Constructs a new {@link Guild Guild} from the specified template code.
-     *
-     * <p>This RestAction does not provide the resulting Guild!
-     * It will be in a following {@link net.dv8tion.jda.api.events.guild.GuildJoinEvent GuildJoinEvent}.
-     *
-     * <p>Possible {@link net.dv8tion.jda.api.requests.ErrorResponse ErrorResponses} include:
-     * <ul>
-     *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_GUILD_TEMPLATE Unknown Guild Template}
-     *     <br>The template doesn't exist.</li>
-     * </ul>
-     *
-     * @param  code
-     *         The template code to use to create a guild
-     * @param  name
-     *         The name of the resulting guild
-     * @param  icon
-     *         The {@link net.dv8tion.jda.api.entities.Icon Icon} to use, or null to use no icon
-     *
-     * @throws java.lang.IllegalStateException
-     *         If the currently logged in account is in 10 or more guilds
-     * @throws java.lang.IllegalArgumentException
-     *         If the provided name is empty, {@code null} or not between 2-100 characters
-     *
-     * @return {@link net.dv8tion.jda.api.requests.RestAction RestAction}
-     */
-    @Nonnull
-    @CheckReturnValue
-    RestAction<Void> createGuildFromTemplate(@Nonnull String code, @Nonnull String name, @Nullable Icon icon);
-
     /**
      * {@link net.dv8tion.jda.api.utils.cache.CacheView CacheView} of
      * all cached {@link net.dv8tion.jda.api.managers.AudioManager AudioManagers} created for this JDA instance.
@@ -1170,25 +1117,25 @@ default List<User> getUsersByName(@Nonnull String name, boolean ignoreCase)
      * @param  users
      *         The users which all the returned {@link Guild Guilds} must contain.
      *
-     * @return Immutable list of all {@link Guild Guild} instances which have all {@link net.dv8tion.jda.api.entities.User Users} in them.
+     * @return Immutable list of all {@link Guild Guild} instances which have all {@link net.dv8tion.jda.api.entities.UserSnowflake Users} in them.
      *
      * @see    Guild#isMember(UserSnowflake)
      */
     @Nonnull
     @Unmodifiable
-    List<Guild> getMutualGuilds(@Nonnull User... users);
+    List<Guild> getMutualGuilds(@Nonnull UserSnowflake... users);
 
     /**
      * Gets all {@link Guild Guilds} that contain all given users as their members.
      *
      * @param users
      *        The users which all the returned {@link Guild Guilds} must contain.
      *
-     * @return Immutable list of all {@link Guild Guild} instances which have all {@link net.dv8tion.jda.api.entities.User Users} in them.
+     * @return Immutable list of all {@link Guild Guild} instances which have all {@link net.dv8tion.jda.api.entities.UserSnowflake Users} in them.
      */
     @Nonnull
     @Unmodifiable
-    List<Guild> getMutualGuilds(@Nonnull Collection<User> users);
+    List<Guild> getMutualGuilds(@Nonnull Collection<? extends UserSnowflake> users);
 
     /**
      * Attempts to retrieve a {@link net.dv8tion.jda.api.entities.User User} object based on the provided id.

gradlew

@@ -65,6 +65,7 @@ public enum Permission
     MESSAGE_ATTACH_VOICE_MESSAGE(46, true, true, "Send Voice Messages"),
     MESSAGE_SEND_POLLS(          49, true, true, "Create Polls"),
     USE_EXTERNAL_APPLICATIONS(   50, true, true, "Use External Apps"),
+    PIN_MESSAGES(                51, true, true, "Pin Messages"),
 
     // Thread Permissions
     MANAGE_THREADS(          34, true, true, "Manage Threads"),

src/main/java/net/dv8tion/jda/api/JDA.java

@@ -23,8 +23,7 @@
 import net.dv8tion.jda.api.components.container.ContainerChildComponent;
 import net.dv8tion.jda.api.components.section.SectionAccessoryComponent;
 import net.dv8tion.jda.api.components.section.SectionContentComponent;
-import net.dv8tion.jda.api.interactions.modals.Modal;
-import net.dv8tion.jda.api.interactions.modals.ModalTopLevelComponent;
+import net.dv8tion.jda.api.modals.Modal;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;

src/main/java/net/dv8tion/jda/api/Permission.java

@@ -18,8 +18,7 @@
 
 import net.dv8tion.jda.api.components.tree.ComponentTree;
 import net.dv8tion.jda.api.components.tree.MessageComponentTree;
-import net.dv8tion.jda.api.interactions.modals.ModalTopLevelComponentUnion;
-import net.dv8tion.jda.api.interactions.modals.tree.ModalComponentTree;
+import net.dv8tion.jda.api.components.tree.ModalComponentTree;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.components.UnknownComponentImpl;

src/main/java/net/dv8tion/jda/api/components/Component.java

@@ -20,7 +20,6 @@
 import net.dv8tion.jda.api.components.container.ContainerChildComponentUnion;
 import net.dv8tion.jda.api.components.section.SectionAccessoryComponentUnion;
 import net.dv8tion.jda.api.components.section.SectionContentComponentUnion;
-import net.dv8tion.jda.api.interactions.modals.ModalTopLevelComponentUnion;
 
 import javax.annotation.Nonnull;