Merge branch 'discord-jda:master' into master

Author: dima-dencep

build.gradle.kts

@@ -42,7 +42,7 @@ plugins {
 
 
 val javaVersion = JavaVersion.current()
-val versionObj = Version(major = "5", minor = "4", revision = "0", classifier = null)
+val versionObj = Version(major = "5", minor = "5", revision = "1", classifier = null)
 val isGithubAction = System.getProperty("GITHUB_ACTION") != null || System.getenv("GITHUB_ACTION") != null
 val isCI = System.getProperty("BUILD_NUMBER") != null // jenkins
         || System.getenv("BUILD_NUMBER") != null
@@ -359,9 +359,15 @@ val build by tasks.getting(Task::class) {
 
 val test by tasks.getting(Test::class) {
     useJUnitPlatform()
-    failFast = true
+    failFast = false
 }
 
+val updateTestSnapshots by tasks.registering(Test::class) {
+    useJUnitPlatform()
+    failFast = false
+
+    systemProperty("updateSnapshots", "true")
+}
 
 ////////////////////////////////////
 //                                //

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

@@ -17,6 +17,7 @@
 package net.dv8tion.jda.api;
 
 import net.dv8tion.jda.annotations.Incubating;
+import net.dv8tion.jda.annotations.ReplaceWith;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.attribute.IGuildChannelContainer;
@@ -820,10 +821,17 @@ default CommandCreateAction upsertCommand(@Nonnull String name, @Nonnull String
      *         If the provided id is not a valid snowflake
      *
      * @return {@link CommandEditAction} used to edit the command
+     *
+     * @deprecated Use {@link #editCommandById(Command.Type, String)} instead
      */
     @Nonnull
     @CheckReturnValue
-    CommandEditAction editCommandById(@Nonnull String id);
+    @Deprecated
+    @ReplaceWith("editCommandById(Command.Type, id)")
+    default CommandEditAction editCommandById(@Nonnull String id)
+    {
+        return editCommandById(Command.Type.SLASH, id);
+    }
 
     /**
      * Edit an existing global command by id.
@@ -835,14 +843,61 @@ default CommandCreateAction upsertCommand(@Nonnull String name, @Nonnull String
      *         The id of the command to edit
      *
      * @return {@link CommandEditAction} used to edit the command
+     *
+     * @deprecated Use {@link #editCommandById(Command.Type, long)} instead
      */
     @Nonnull
     @CheckReturnValue
+    @Deprecated
+    @ReplaceWith("editCommandById(Command.Type, id)")
     default CommandEditAction editCommandById(long id)
     {
         return editCommandById(Long.toUnsignedString(id));
     }
 
+    /**
+     * Edit an existing global command by id.
+     *
+     * <p>If there is no command with the provided ID,
+     * this RestAction fails with {@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_COMMAND ErrorResponse.UNKNOWN_COMMAND}
+     *
+     * @param  type
+     *         The command type
+     * @param  id
+     *         The id of the command to edit
+     *
+     * @throws IllegalArgumentException
+     *         If the provided id is not a valid snowflake or the type is {@link Command.Type#UNKNOWN}
+     *
+     * @return {@link CommandEditAction} used to edit the command
+     */
+    @Nonnull
+    @CheckReturnValue
+    CommandEditAction editCommandById(@Nonnull Command.Type type, @Nonnull String id);
+
+    /**
+     * Edit an existing global command by id.
+     *
+     * <p>If there is no command with the provided ID,
+     * this RestAction fails with {@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_COMMAND ErrorResponse.UNKNOWN_COMMAND}
+     *
+     * @param  type
+     *         The command type
+     * @param  id
+     *         The id of the command to edit
+     *
+     * @throws IllegalArgumentException
+     *         If the type is {@link Command.Type#UNKNOWN}
+     *
+     * @return {@link CommandEditAction} used to edit the command
+     */
+    @Nonnull
+    @CheckReturnValue
+    default CommandEditAction editCommandById(@Nonnull Command.Type type, long id)
+    {
+        return editCommandById(type, Long.toUnsignedString(id));
+    }
+
     /**
      * Delete the global command for this id.
      *