Adapt user-apps changes

freya022 · freya022 · commit ddd678b6efbe · 2025-02-20T22:56:23.000+01:00
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/build/EntryPointCommandData.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/build/EntryPointCommandData.java
@@ -17,18 +17,23 @@
 package net.dv8tion.jda.api.interactions.commands.build;
 
 import net.dv8tion.jda.api.interactions.DiscordLocale;
+import net.dv8tion.jda.api.interactions.IntegrationType;
+import net.dv8tion.jda.api.interactions.InteractionContextType;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.attributes.*;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
 import net.dv8tion.jda.api.requests.restaction.GlobalCommandListUpdateAction;
+import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.api.utils.data.SerializableData;
 import net.dv8tion.jda.internal.interactions.EntryPointCommandDataImpl;
 import net.dv8tion.jda.internal.utils.Checks;
+import net.dv8tion.jda.internal.utils.Helpers;
 import net.dv8tion.jda.internal.utils.localization.LocalizationUtils;
 
 import javax.annotation.Nonnull;
+import java.util.Collection;
 import java.util.Map;
 
 /**
@@ -79,6 +84,28 @@ public interface EntryPointCommandData
     @Override
     EntryPointCommandData setGuildOnly(boolean guildOnly);
 
+    @Nonnull
+    @Override
+    default EntryPointCommandData setContexts(@Nonnull InteractionContextType... contexts)
+    {
+        return (EntryPointCommandData) IScopedCommandData.super.setContexts(contexts);
+    }
+
+    @Nonnull
+    @Override
+    EntryPointCommandData setContexts(@Nonnull Collection<InteractionContextType> contexts);
+
+    @Nonnull
+    @Override
+    default EntryPointCommandData setIntegrationTypes(@Nonnull IntegrationType... integrationTypes)
+    {
+        return (EntryPointCommandData) IScopedCommandData.super.setIntegrationTypes(integrationTypes);
+    }
+
+    @Nonnull
+    @Override
+    EntryPointCommandData setIntegrationTypes(@Nonnull Collection<IntegrationType> integrationTypes);
+
     @Nonnull
     @Override
     EntryPointCommandData setNSFW(boolean nsfw);
@@ -115,7 +142,8 @@ static EntryPointCommandData fromCommand(@Nonnull Command command)
             throw new IllegalArgumentException("Cannot convert command of type " + command.getType() + " to EntryPointCommandData!");
 
         EntryPointCommandDataImpl data = new EntryPointCommandDataImpl(command.getName(), command.getDescription());
-        data.setGuildOnly(command.isGuildOnly());
+        data.setContexts(command.getContexts());
+        data.setIntegrationTypes(command.getIntegrationTypes());
         data.setNSFW(command.isNSFW());
         data.setDefaultPermissions(command.getDefaultPermissions());
         //Command localizations are unmodifiable, make a copy
@@ -150,7 +178,28 @@ static EntryPointCommandData fromData(@Nonnull DataObject object)
         String name = object.getString("name");
         String description = object.getString("description");
         EntryPointCommandDataImpl command = new EntryPointCommandDataImpl(name, description);
-        command.setGuildOnly(!object.getBoolean("dm_permission", true));
+        if (!object.isNull("contexts"))
+        {
+            command.setContexts(object.getArray("contexts")
+                    .stream(DataArray::getString)
+                    .map(InteractionContextType::fromKey)
+                    .collect(Helpers.toUnmodifiableEnumSet(InteractionContextType.class)));
+        }
+        else if (!object.isNull("dm_permission"))
+            command.setGuildOnly(!object.getBoolean("dm_permission"));
+        else
+            command.setContexts(Helpers.unmodifiableEnumSet(InteractionContextType.GUILD, InteractionContextType.BOT_DM));
+
+        if (!object.isNull("integration_types"))
+        {
+            command.setIntegrationTypes(object.getArray("integration_types")
+                    .stream(DataArray::getString)
+                    .map(IntegrationType::fromKey)
+                    .collect(Helpers.toUnmodifiableEnumSet(IntegrationType.class)));
+        }
+        else
+            command.setIntegrationTypes(Helpers.unmodifiableEnumSet(IntegrationType.GUILD_INSTALL));
+
         command.setNSFW(object.getBoolean("nsfw"));
 
         command.setDefaultPermissions(
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/build/attributes/IScopedCommandData.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/build/attributes/IScopedCommandData.java
@@ -16,7 +16,16 @@
 
 package net.dv8tion.jda.api.interactions.commands.build.attributes;
 
+import net.dv8tion.jda.annotations.ReplaceWith;
+import net.dv8tion.jda.api.interactions.IntegrationType;
+import net.dv8tion.jda.api.interactions.InteractionContextType;
+import net.dv8tion.jda.internal.utils.Checks;
+import org.jetbrains.annotations.UnmodifiableView;
+
 import javax.annotation.Nonnull;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * Builder for scoped Application Commands.
@@ -35,15 +44,109 @@ public interface IScopedCommandData extends INamedCommandData
      *         Whether to restrict this command to guilds
      *
      * @return The builder instance, for chaining
+     *
+     * @deprecated Replaced with {@link #setContexts(InteractionContextType...)}
      */
     @Nonnull
+    @Deprecated
+    @ReplaceWith("setContexts(InteractionContextType.GUILD)")
     IScopedCommandData setGuildOnly(boolean guildOnly);
 
     /**
      * Whether the command can only be used inside a guild.
      * <br>Always true for guild commands.
      *
      * @return True, if this command is restricted to guilds.
+     *
+     * @deprecated Replaced with {@link #getContexts()}
      */
+    @Deprecated
+    @ReplaceWith("getContexts().equals(EnumSet.of(InteractionContextType.GUILD))")
     boolean isGuildOnly();
+
+    /**
+     * Sets the contexts in which this command can be used (Default: Guild and Bot DMs).
+     * <br>This only has an effect if this command is registered globally.
+     *
+     * @param  contexts
+     *         The contexts in which this command can be used
+     *
+     * @throws IllegalArgumentException
+     *         If {@code null} or no interaction context types were passed
+     *
+     * @return The builder instance, for chaining
+     */
+    @Nonnull
+    default IScopedCommandData setContexts(@Nonnull InteractionContextType... contexts)
+    {
+        Checks.notEmpty(contexts, "Contexts");
+        return setContexts(Arrays.asList(contexts));
+    }
+
+    /**
+     * Sets the contexts in which this command can be used (Default: Guild and Bot DMs).
+     * <br>This only has an effect if this command is registered globally.
+     *
+     * @param  contexts
+     *         The contexts in which this command can be used
+     *
+     * @throws IllegalArgumentException
+     *         If {@code null} or no interaction context types were passed
+     *
+     * @return The builder instance, for chaining
+     */
+    @Nonnull
+    IScopedCommandData setContexts(@Nonnull Collection<InteractionContextType> contexts);
+
+    /**
+     * Sets the integration types on which this command can be installed on (Default: Guilds).
+     * <br>This only has an effect if this command is registered globally.
+     *
+     * @param  integrationTypes
+     *         The integration types on which this command can be installed on
+     *
+     * @throws IllegalArgumentException
+     *         If {@code null} or no integration types were passed
+     *
+     * @return The builder instance, for chaining
+     */
+    @Nonnull
+    default IScopedCommandData setIntegrationTypes(@Nonnull IntegrationType... integrationTypes)
+    {
+        Checks.notEmpty(integrationTypes, "Integration types");
+        return setIntegrationTypes(Arrays.asList(integrationTypes));
+    }
+
+    /**
+     * Sets the integration types on which this command can be installed on (Default: Guilds).
+     * <br>This only has an effect if this command is registered globally.
+     *
+     * @param  integrationTypes
+     *         The integration types on which this command can be installed on
+     *
+     * @throws IllegalArgumentException
+     *         If {@code null} or no integration types were passed
+     *
+     * @return The builder instance, for chaining
+     */
+    @Nonnull
+    IScopedCommandData setIntegrationTypes(@Nonnull Collection<IntegrationType> integrationTypes);
+
+    /**
+     * The contexts in which this command can be used.
+     *
+     * @return The contexts in which this command can be used
+     */
+    @Nonnull
+    @UnmodifiableView
+    Set<InteractionContextType> getContexts();
+
+    /**
+     * Gets the integration types on which this command can be installed on.
+     *
+     * @return The integration types on which this command can be installed on
+     */
+    @Nonnull
+    @UnmodifiableView
+    Set<IntegrationType> getIntegrationTypes();
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/EntryPointCommandDataImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/EntryPointCommandDataImpl.java
@@ -17,6 +17,8 @@
 package net.dv8tion.jda.internal.interactions;
 
 import net.dv8tion.jda.api.interactions.DiscordLocale;
+import net.dv8tion.jda.api.interactions.IntegrationType;
+import net.dv8tion.jda.api.interactions.InteractionContextType;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.EntryPointCommandData;
@@ -27,9 +29,13 @@
 import net.dv8tion.jda.internal.interactions.command.localization.LocalizationMapper;
 import net.dv8tion.jda.internal.interactions.mixin.attributes.IDescribedCommandDataMixin;
 import net.dv8tion.jda.internal.utils.Checks;
+import net.dv8tion.jda.internal.utils.Helpers;
 
 import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.EnumSet;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class EntryPointCommandDataImpl implements EntryPointCommandData, IDescribedCommandDataMixin
 {
@@ -38,7 +44,8 @@ public class EntryPointCommandDataImpl implements EntryPointCommandData, IDescri
     private final LocalizationMap nameLocalizations = new LocalizationMap(this::checkName);
     private final LocalizationMap descriptionLocalizations = new LocalizationMap(this::checkDescription);
 
-    private boolean guildOnly = false;
+    private EnumSet<InteractionContextType> contexts = EnumSet.of(InteractionContextType.GUILD, InteractionContextType.BOT_DM);
+    private EnumSet<IntegrationType> integrationTypes = EnumSet.of(IntegrationType.GUILD_INSTALL);
     private boolean nsfw = false;
     private DefaultMemberPermissions defaultMemberPermissions = DefaultMemberPermissions.ENABLED;
     private Handler handler;
@@ -62,7 +69,8 @@ public DataObject toData()
                 .put("description", description)
                 .put("description_localizations", descriptionLocalizations)
                 .put("nsfw", nsfw)
-                .put("dm_permission", !guildOnly)
+                .put("contexts", contexts.stream().map(InteractionContextType::getType).collect(Collectors.toList()))
+                .put("integration_types", integrationTypes.stream().map(IntegrationType::getType).collect(Collectors.toList()))
                 .put("default_member_permissions", defaultMemberPermissions == DefaultMemberPermissions.ENABLED
                         ? null
                         : Long.toUnsignedString(defaultMemberPermissions.getPermissionsRaw()))
@@ -86,7 +94,21 @@ public DefaultMemberPermissions getDefaultPermissions()
     @Override
     public boolean isGuildOnly()
     {
-        return guildOnly;
+        return contexts.size() == 1 && contexts.contains(InteractionContextType.GUILD);
+    }
+
+    @Nonnull
+    @Override
+    public EnumSet<InteractionContextType> getContexts()
+    {
+        return contexts;
+    }
+
+    @Nonnull
+    @Override
+    public EnumSet<IntegrationType> getIntegrationTypes()
+    {
+        return integrationTypes;
     }
 
     @Override
@@ -108,7 +130,27 @@ public EntryPointCommandDataImpl setDefaultPermissions(@Nonnull DefaultMemberPer
     @Override
     public EntryPointCommandDataImpl setGuildOnly(boolean guildOnly)
     {
-        this.guildOnly = guildOnly;
+        setContexts(guildOnly
+                ? EnumSet.of(InteractionContextType.GUILD)
+                : EnumSet.of(InteractionContextType.GUILD, InteractionContextType.BOT_DM));
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    public EntryPointCommandDataImpl setContexts(@Nonnull Collection<InteractionContextType> contexts)
+    {
+        Checks.notEmpty(contexts, "Contexts");
+        this.contexts = Helpers.copyEnumSet(InteractionContextType.class, contexts);
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    public EntryPointCommandDataImpl setIntegrationTypes(@Nonnull Collection<IntegrationType> integrationTypes)
+    {
+        Checks.notEmpty(contexts, "Contexts");
+        this.integrationTypes = Helpers.copyEnumSet(IntegrationType.class, integrationTypes);
         return this;
     }
 
