Interactions, Slash-Commands, and Buttons

README.md

@@ -229,6 +229,40 @@ public class Bot extends ListenerAdapter
 }
 ```
 
+**Slash-Commands**:
+
+```java
+public class Bot extends ListenerAdapter
+{
+    public static void main(String[] args) throws LoginException
+    {
+        if (args.length < 1) {
+            System.out.println("You have to provide a token as first argument!");
+            System.exit(1);
+        }
+        // args[0] should be the token
+        // We don't need any intents for this bot. Slash commands work without any intents!
+        JDA jda = JDABuilder.createLight(args[0], Collections.emptyList())
+            .addEventListeners(new Bot())
+            .setActivity(Activity.playing("Type /ping"))
+            .build();
+
+        jda.upsertCommand("ping", "Calculate ping of the bot").queue(); // This can take up to 1 hour to show up in the client
+    }
+
+    @Override
+    public void onSlashCommand(SlashCommandEvent event)
+    {
+        if (!event.getName().equals("ping")) return; // make sure we handle the right command
+        long time = System.currentTimeMillis();
+        event.reply("Pong!").setEphemeral(true) // reply or acknowledge
+             .flatMap(v ->
+                 event.getHook().editOriginalFormat("Pong: %d ms", System.currentTimeMillis() - time) // then edit original
+             ).queue(); // Queue both reply and edit
+    }
+}
+```
+
 ### RestAction
 
 Through [RestAction](https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html) we provide request handling with

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/examples/java/SlashBotExample.java

@@ -0,0 +1,143 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.interactions.commands.CommandHook;
+import net.dv8tion.jda.api.interactions.commands.build.CommandData;
+import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import net.dv8tion.jda.api.requests.GatewayIntent;
+import net.dv8tion.jda.api.requests.restaction.CommandUpdateAction;
+
+import javax.security.auth.login.LoginException;
+import java.util.EnumSet;
+
+import static net.dv8tion.jda.api.interactions.commands.OptionType.*;
+
+public class SlashBotExample extends ListenerAdapter
+{
+    public static void main(String[] args) throws LoginException
+    {
+        JDA jda = JDABuilder.createLight("BOT_TOKEN_HERE", EnumSet.noneOf(GatewayIntent.class)) // slash commands don't need any intents
+                .addEventListeners(new SlashBotExample())
+                .build();
+
+        // These commands take up to an hour to be activated after creation/update/delete
+        CommandUpdateAction commands = jda.updateCommands();
+
+        // Moderation commands with required options
+        commands.addCommands(
+            new CommandData("ban", "Ban a user from this server. Requires permission to ban users.")
+                .addOption(new OptionData(USER, "user", "The user to ban") // USER type allows to include members of the server or other users by id
+                    .setRequired(true)) // This command requires a parameter
+                .addOption(new OptionData(INTEGER, "delDays", "Delete messages from the past days.")) // This is optional
+        );
+
+        // Simple reply commands
+        commands.addCommands(
+            new CommandData("say", "Makes the bot say what you tell it to")
+                .addOption(new OptionData(STRING, "content", "What the bot should say")
+                    .setRequired(true))
+        );
+
+        // Commands without any inputs
+        commands.addCommands(
+            new CommandData("leave", "Make the bot leave the server")
+        );
+
+        // Send the new set of commands to discord, this will override any existing global commands with the new set provided here
+        commands.queue();
+    }
+
+
+    @Override
+    public void onSlashCommand(SlashCommandEvent event)
+    {
+        // Only accept commands from guilds
+        if (event.getGuild() == null)
+            return;
+        switch (event.getName())
+        {
+        case "ban":
+            Member member = event.getOption("user").getAsMember(); // the "user" option is required so it doesn't need a null-check here
+            User user = event.getOption("user").getAsUser();
+            ban(event, user, member);
+            break;
+        case "say":
+            say(event, event.getOption("content").getAsString()); // content is required so no null-check here
+            break;
+        case "leave":
+            leave(event);
+            break;
+        default:
+            event.reply("I can't handle that command right now :(").setEphemeral(true).queue();
+        }
+    }
+
+    public void ban(SlashCommandEvent event, User user, Member member)
+    {
+        event.acknowledge(true).queue(); // Let the user know we received the command before doing anything else
+        CommandHook hook = event.getHook(); // This is a special webhook that allows you to send messages without having permissions in the channel and also allows ephemeral messages
+        hook.setEphemeral(true); // All messages here will now be ephemeral implicitly
+        if (!event.getMember().hasPermission(Permission.BAN_MEMBERS))
+        {
+            hook.sendMessage("You do not have the required permissions to ban users from this server.").queue();
+            return;
+        }
+
+        Member selfMember = event.getGuild().getSelfMember();
+        if (!selfMember.hasPermission(Permission.BAN_MEMBERS))
+        {
+            hook.sendMessage("I don't have the required permissions to ban users from this server.").queue();
+            return;
+        }
+
+        if (member != null && !selfMember.canInteract(member))
+        {
+            hook.sendMessage("This user is too powerful for me to ban.").queue();
+            return;
+        }
+
+        int delDays = 0;
+        SlashCommandEvent.OptionData option = event.getOption("delDays");
+        if (option != null) // null = not provided
+            delDays = (int) Math.max(0, Math.min(7, option.getAsLong()));
+        // Ban the user and send a success response
+        event.getGuild().ban(user, delDays)
+            .flatMap(v -> hook.sendMessage("Banned user " + user.getAsTag()))
+            .queue();
+    }
+
+    public void say(SlashCommandEvent event, String content)
+    {
+        event.reply(content).queue(); // This requires no permissions!
+    }
+
+    public void leave(SlashCommandEvent event)
+    {
+        if (!event.getMember().hasPermission(Permission.KICK_MEMBERS))
+            event.reply("You do not have permissions to kick me.").setEphemeral(true).queue();
+        else
+            event.reply("Leaving the server... :wave:") // Yep we received it
+                 .flatMap(v -> event.getGuild().leave()) // Leave server after acknowledging the command
+                 .queue();
+    }
+}

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

@@ -21,13 +21,14 @@
 import net.dv8tion.jda.annotations.ReplaceWith;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.hooks.IEventManager;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.managers.AudioManager;
 import net.dv8tion.jda.api.managers.DirectAudioController;
 import net.dv8tion.jda.api.managers.Presence;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.requests.RestAction;
-import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
-import net.dv8tion.jda.api.requests.restaction.GuildAction;
+import net.dv8tion.jda.api.requests.restaction.*;
 import net.dv8tion.jda.api.sharding.ShardManager;
 import net.dv8tion.jda.api.utils.MiscUtil;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
@@ -47,10 +48,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collection;
-import java.util.EnumSet;
 import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ScheduledExecutorService;
@@ -492,6 +491,54 @@ default JDA awaitReady() throws InterruptedException
     @Nonnull
     List<Object> getRegisteredListeners();
 
+    // TODO: Docs
+    @Nonnull
+    @CheckReturnValue
+    RestAction<List<Command>> retrieveCommands();
+
+    @Nonnull
+    @CheckReturnValue
+    RestAction<Command> retrieveCommandById(@Nonnull String id);
+
+    @Nonnull
+    @CheckReturnValue
+    default RestAction<Command> retrieveCommandById(long id)
+    {
+        return retrieveCommandById(Long.toUnsignedString(id));
+    }
+
+    @Nonnull
+    @CheckReturnValue
+    CommandCreateAction upsertCommand(@Nonnull CommandData command);
+
+    @Nonnull
+    @CheckReturnValue
+    default CommandCreateAction upsertCommand(@Nonnull String name, @Nonnull String description)
+    {
+        return upsertCommand(new CommandData(name, description));
+    }
+
+    @Nonnull
+    @CheckReturnValue
+    CommandUpdateAction updateCommands();
+
+    @Nonnull
+    @CheckReturnValue
+    CommandEditAction editCommandById(@Nonnull String id);
+
+    @Nonnull
+    @CheckReturnValue
+    RestAction<Void> deleteCommandById(@Nonnull String commandId);
+
+    @Nonnull
+    @CheckReturnValue
+    default RestAction<Void> deleteCommandById(long commandId)
+    {
+        return deleteCommandById(Long.toUnsignedString(commandId));
+    }
+
+    // TODO: editing commands
+
     /**
      * Constructs a new {@link net.dv8tion.jda.api.entities.Guild Guild} with the specified name
      * <br>Use the returned {@link GuildAction GuildAction} to provide
@@ -672,7 +719,7 @@ default User getUserByTag(@Nonnull String username, @Nonnull String discriminato
         Checks.notNull(username, "Username");
         Checks.notNull(discriminator, "Discriminator");
         Checks.check(discriminator.length() == 4 && Helpers.isNumeric(discriminator), "Invalid format for discriminator!");
-        int codePointLength = username.codePointCount(0, username.length());
+        int codePointLength = Helpers.codePointLength(username);
         Checks.check(codePointLength >= 2 && codePointLength <= 32, "Username must be between 2 and 32 codepoints in length!");
         return getUserCache().applyStream(stream ->
             stream.filter(it -> it.getDiscriminator().equals(discriminator))
@@ -1922,6 +1969,40 @@ default List<Emote> getEmotesByName(@Nonnull String name, boolean ignoreCase)
     @CheckReturnValue
     RestAction<ApplicationInfo> retrieveApplicationInfo();
 
+    /**
+     * Configures the required scopes applied to the {@link #getInviteUrl(Permission...)} and similar methods.
+     * <br>To use slash commands you must add {@code "applications.commands"} to these scopes. The scope {@code "bot"} is always applied.
+     *
+     * @param  scopes
+     *         The scopes to use with {@link #getInviteUrl(Permission...)} and the likes
+     *
+     * @throws IllegalArgumentException
+     *         If null is provided
+     *
+     * @return The current JDA instance
+     */
+    @Nonnull
+    default JDA setRequiredScopes(@Nonnull String... scopes)
+    {
+        Checks.noneNull(scopes, "Scopes");
+        return setRequiredScopes(Arrays.asList(scopes));
+    }
+
+    /**
+     * Configures the required scopes applied to the {@link #getInviteUrl(Permission...)} and similar methods.
+     * <br>To use slash commands you must add {@code "applications.commands"} to these scopes. The scope {@code "bot"} is always applied.
+     *
+     * @param  scopes
+     *         The scopes to use with {@link #getInviteUrl(Permission...)} and the likes
+     *
+     * @throws IllegalArgumentException
+     *         If null is provided
+     *
+     * @return The current JDA instance
+     */
+    @Nonnull
+    JDA setRequiredScopes(@Nonnull Collection<String> scopes);
+
     /**
      * Creates an authorization invite url for the currently logged in Bot-Account.
      * <br>Example Format:

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

@@ -55,7 +55,7 @@ public enum Permission
     USE_SLASH_COMMANDS(      31, true, true, "Use Slash Commands"),
 
     // Voice Permissions
-    VOICE_STREAM(      9, true, true, "Stream"),
+    VOICE_STREAM(      9, true, true, "Video"),
     VOICE_CONNECT(    20, true, true, "Connect"),
     VOICE_SPEAK(      21, true, true, "Speak"),
     VOICE_MUTE_OTHERS(22, true, true, "Mute Members"),

src/main/java/net/dv8tion/jda/api/entities/AbstractChannel.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities;
+
+import net.dv8tion.jda.api.JDA;
+
+import javax.annotation.Nonnull;
+
+public interface AbstractChannel extends ISnowflake
+{
+    /**
+     * The human readable name of this channel.
+     * <br>If no name has been set, this returns null.
+     *
+     * @return The name of this channel
+     */
+    @Nonnull
+    String getName();
+
+    /**
+     * The {@link net.dv8tion.jda.api.entities.ChannelType ChannelType} for this channel
+     *
+     * @return The channel type
+     */
+    @Nonnull
+    ChannelType getType();
+
+    /**
+     * Returns the {@link net.dv8tion.jda.api.JDA JDA} instance of this channel
+     *
+     * @return the corresponding JDA instance
+     */
+    @Nonnull
+    JDA getJDA();
+}