children;
/**
@@ -38,9 +38,9 @@ public TreeNode() {
* Constructs a new TreeNode.
*
* @param name the name of the command
- * @param command the {@link CommandDefinition}
+ * @param command the {@link SlashCommandDefinition}
*/
- public TreeNode(@NotNull String name, @Nullable CommandDefinition command) {
+ public TreeNode(@NotNull String name, @Nullable SlashCommandDefinition command) {
this.name = name;
this.command = command;
children = new ArrayList<>();
@@ -57,9 +57,9 @@ public TreeNode(@NotNull String name, @Nullable CommandDefinition command) {
* This guarantees to create a {@link CommandTree} that respects Subcommands and SubcommandGroups.
*
* @param labels an Array of all labels, can be empty
- * @param command the {@link CommandDefinition} to add
+ * @param command the {@link SlashCommandDefinition} to add
*/
- public void addChild(@NotNull String[] labels, @NotNull CommandDefinition command) {
+ public void addChild(@NotNull String[] labels, @NotNull SlashCommandDefinition command) {
if (labels.length < 1) {
return;
}
@@ -89,9 +89,9 @@ public Optional getChild(String name) {
}
/**
- * Gets the label of the {@link CommandDefinition} of this {@link TreeNode}.
+ * Gets the label of the {@link SlashCommandDefinition} of this {@link TreeNode}.
*
- * @return the label of the {@link CommandDefinition}
+ * @return the label of the {@link SlashCommandDefinition}
*/
public String getName() {
return name;
@@ -116,12 +116,12 @@ public boolean hasChildren() {
}
/**
- * Gets the {@link CommandDefinition} of this {@link TreeNode}. Returns an empty {@link Optional} if one or more
- * children exist or if the {@link CommandDefinition} is {@code null}.
+ * Gets the {@link SlashCommandDefinition} of this {@link TreeNode}. Returns an empty {@link Optional} if one or more
+ * children exist or if the {@link SlashCommandDefinition} is {@code null}.
*
* @return an {@link Optional} holding the result
*/
- public Optional getCommand() {
+ public Optional getCommand() {
if (children.size() > 0) {
return Optional.empty();
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
index 3568e169..c2c63b25 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
@@ -1,39 +1,41 @@
package com.github.kaktushose.jda.commands.dispatching;
import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteContext;
import com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.buttons.ButtonContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.buttons.ButtonDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.menus.SelectMenuContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.menus.SelectMenuDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalDispatcher;
import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
/**
- * Registry for {@link GenericDispatcher Dispatchers}. Delegates incoming {@link GenericContext} to the respective
+ * Registry for {@link GenericDispatcher Dispatchers}. Delegates incoming {@link Context} to the respective
* {@link GenericDispatcher}.
*
* @author Kaktushose
* @version 4.0.0
* @since 4.0.0
*/
-public class DispatcherSupervisor {
+public class DispatcherSupervisor extends ListenerAdapter {
private static final Logger log = LoggerFactory.getLogger(DispatcherSupervisor.class);
- private final Map>,
- GenericDispatcher>> dispatchers;
+ private final Map, GenericDispatcher> dispatchers;
private final JDACommands jdaCommands;
- private final RuntimeSupervisor runtimeSupervisor;
/**
* Constructs a new DispatcherSupervisor.
@@ -41,53 +43,53 @@ public class DispatcherSupervisor {
public DispatcherSupervisor(JDACommands jdaCommands) {
this.jdaCommands = jdaCommands;
dispatchers = new HashMap<>();
- runtimeSupervisor = new RuntimeSupervisor(jdaCommands.getDependencyInjector());
- register(CommandContext.class, new CommandDispatcher(this, runtimeSupervisor));
- register(ButtonContext.class, new ButtonDispatcher(this, runtimeSupervisor));
- register(SelectMenuContext.class, new SelectMenuDispatcher(this, runtimeSupervisor));
- register(AutoCompleteContext.class, new AutoCompleteDispatcher(this, runtimeSupervisor));
+ register(GenericCommandInteractionEvent.class, new CommandDispatcher(jdaCommands));
+ register(CommandAutoCompleteInteractionEvent.class, new AutoCompleteDispatcher(jdaCommands));
+ register(GenericComponentInteractionCreateEvent.class, new ComponentDispatcher(jdaCommands));
+ register(ModalInteractionEvent.class, new ModalDispatcher(jdaCommands));
}
/**
* Registers a new {@link GenericDispatcher}.
*
- * @param context a subtype of {@link GenericContext}
+ * @param event a subtype of {@link GenericInteractionCreateEvent}
* @param dispatcher the {@link GenericDispatcher} implementation for the event
*/
- public void register(@NotNull Class> context,
- @NotNull GenericDispatcher> dispatcher) {
- dispatchers.put(context, dispatcher);
- log.debug("Registered dispatcher {} for event {}", dispatcher.getClass().getName(), context.getSimpleName());
+ public void register(@NotNull Class event, @NotNull GenericDispatcher dispatcher) {
+ dispatchers.put(event, dispatcher);
+ log.debug("Registered dispatcher {} for event {}", dispatcher.getClass().getName(), event.getSimpleName());
}
/**
* Unregisters a {@link GenericDispatcher}
*
- * @param context the {@link GenericContext} to unregister any {@link GenericDispatcher} for
+ * @param event the {@link GenericInteractionCreateEvent} to unregister any {@link GenericDispatcher} for
*/
- public void unregister(@NotNull Class> context) {
- dispatchers.remove(context);
- log.debug("Unregistered dispatcher binding for event {}", context.getSimpleName());
+ public void unregister(@NotNull Class event) {
+ dispatchers.remove(event);
+ log.debug("Unregistered dispatcher binding for event {}", event.getSimpleName());
}
- /**
- * Dispatches a {@link GenericContext} to its respective {@link GenericDispatcher}, e.g.
- * CommandContext -> CommandDispatcher. Prints a warning if no {@link GenericDispatcher} was registered.
- *
- * @param context the {@link GenericContext} to dispatch
- */
- @SuppressWarnings({"unchecked", "rawtypes"})
- public void onGenericEvent(@NotNull GenericContext context) {
- Class clazz = context.getClass();
- if (!dispatchers.containsKey(clazz)) {
- log.warn("No dispatcher found for {}", clazz.getSimpleName());
+ @Override
+ public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent event) {
+ Class clazz = event.getClass();
+ Optional> key = dispatchers.keySet().stream()
+ .filter(it -> it.isAssignableFrom(clazz))
+ .findFirst();
+ if (key.isEmpty()) {
+ log.debug("No dispatcher found for {}", clazz.getSimpleName());
return;
}
- log.debug("Received {}", clazz.getSimpleName());
- GenericDispatcher dispatcher = dispatchers.get(clazz);
- log.debug("Calling {}", dispatcher.getClass().getName());
+ Context context;
+ if (SlashCommandInteractionEvent.class.isAssignableFrom(clazz)) {
+ context = new SlashCommandContext((SlashCommandInteractionEvent) event, jdaCommands);
+ } else {
+ context = new Context(event, jdaCommands);
+ }
+ GenericDispatcher dispatcher = dispatchers.get(key.get());
+ log.debug("Calling {}", dispatcher.getClass().getName());
try {
dispatcher.onEvent(context);
} catch (Exception e) {
@@ -95,13 +97,4 @@ public void onGenericEvent(@NotNull GenericContext, GenericParser> listeners;
-
- /**
- * Constructs a new ParserSupervisor.
- *
- * @param dispatcher the calling {@link DispatcherSupervisor}
- */
- public ParserSupervisor(@NotNull DispatcherSupervisor dispatcher) {
- listeners = new HashMap<>();
- this.dispatcher = dispatcher;
- register(SlashCommandInteractionEvent.class, new CommandParser());
- register(ButtonInteractionEvent.class, new ButtonParser());
- register(EntitySelectInteractionEvent.class, new SelectMenuParser());
- register(StringSelectInteractionEvent.class, new SelectMenuParser());
- register(CommandAutoCompleteInteractionEvent.class, new AutoCompleteParser());
- }
-
- /**
- * Registers a new {@link GenericParser} for the given subtype of {@link GenericEvent}.
- *
- * @param listener the subtype of {@link GenericEvent}
- * @param parser the {@link GenericParser} to register
- */
- public void register(@NotNull Class listener, @NotNull GenericParser parser) {
- listeners.put(listener, parser);
- log.debug("Registered parser {} for event {}", parser.getClass().getName(), listener.getSimpleName());
- }
-
- /**
- * Unregisters the {@link GenericParser} for the given subtype of {@link GenericEvent}.
- *
- * @param listener the subtype of {@link GenericEvent}
- */
- public void unregister(@NotNull Class listener) {
- listeners.remove(listener);
- log.debug("Unregistered parser binding for event {}", listener.getSimpleName());
- }
-
- /**
- * Distributes {@link GenericEvent GenericEvents} to the corresponding parser. If the parsing didn't fail, will call
- * {@link DispatcherSupervisor#onGenericEvent(GenericContext)}
- *
- * @param event the {@link GenericEvent GenericEvents} to distribute
- */
- @Override
- public void onGenericEvent(@NotNull GenericEvent event) {
- if (!listeners.containsKey(event.getClass())) {
- return;
- }
- log.debug("Received {}", event.getClass().getSimpleName());
- GenericParser parser = listeners.get(event.getClass());
- log.debug("Calling {}", parser.getClass().getName());
-
- GenericContext context = parser.parseInternal(event, dispatcher.getJdaCommands());
-
- if (context.isCancelled()) {
- if (context.getErrorMessage() != null) {
- // TODO send message
- }
- return;
- }
- dispatcher.onGenericEvent(context);
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
index 55fd0bf2..368efb31 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
@@ -1,7 +1,8 @@
package com.github.kaktushose.jda.commands.dispatching;
import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteraction;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
@@ -45,14 +46,14 @@ public RuntimeSupervisor(DependencyInjector injector) {
* Creates a new {@link InteractionRuntime}.
*
* @param event the {@link GenericCommandInteractionEvent} to create the {@link InteractionRuntime} for
- * @param interaction the {@link GenericInteraction} to create the {@link InteractionRuntime} from
+ * @param interaction the {@link GenericInteractionDefinition} to create the {@link InteractionRuntime} from
* @return a new {@link InteractionRuntime} with a TTL of 15 minutes
* @throws InvocationTargetException if the underlying constructor throws an exception
* @throws InstantiationException if the class that declares the underlying constructor represents an abstract class
* @throws IllegalAccessException if this Constructor object is enforcing Java language access control and
* the underlying constructor is inaccessible
*/
- public InteractionRuntime newRuntime(GenericCommandInteractionEvent event, GenericInteraction interaction)
+ public InteractionRuntime newRuntime(GenericCommandInteractionEvent event, GenericInteractionDefinition interaction)
throws InvocationTargetException, InstantiationException, IllegalAccessException {
Object instance = interaction.newInstance();
@@ -68,18 +69,18 @@ public InteractionRuntime newRuntime(GenericCommandInteractionEvent event, Gener
}
/**
- * Gets an instance of the given {@link GenericInteraction}. If no instance exists yet, creates, stores and then
+ * Gets an instance of the given {@link GenericInteractionDefinition}. If no instance exists yet, creates, stores and then
* returns the instance.
*
* @param event the {@link CommandAutoCompleteInteractionEvent} to get the instance for
- * @param interaction the {@link GenericInteraction} to create or get an instance from
- * @return an instance of the provided {@link GenericInteraction}
+ * @param interaction the {@link GenericInteractionDefinition} to create or get an instance from
+ * @return an instance of the provided {@link GenericInteractionDefinition}
* @throws InvocationTargetException if the underlying constructor throws an exception
* @throws InstantiationException if the class that declares the underlying constructor represents an abstract class
* @throws IllegalAccessException if this Constructor object is enforcing Java language access control and
* the underlying constructor is inaccessible
*/
- public Object getOrCreateInstance(CommandAutoCompleteInteractionEvent event, GenericInteraction interaction)
+ public Object getOrCreateInstance(CommandAutoCompleteInteractionEvent event, GenericInteractionDefinition interaction)
throws InvocationTargetException, InstantiationException, IllegalAccessException {
String name = event.getFullCommandName();
if (staticInstances.containsKey(name)) {
@@ -94,7 +95,7 @@ public Object getOrCreateInstance(CommandAutoCompleteInteractionEvent event, Gen
/**
* Gets an {@link Optional} holding the {@link InteractionRuntime}. Returns an empty {@link Optional} if no
* {@link InteractionRuntime} has been created yet by calling
- * {@link #newRuntime(GenericCommandInteractionEvent, GenericInteraction)}, if the underlying component wasn't
+ * {@link #newRuntime(GenericCommandInteractionEvent, GenericInteractionDefinition)}, if the underlying component wasn't
* created by jda-commands or if the {@link InteractionRuntime} expired.
*
* @param event the {@link GenericComponentInteractionCreateEvent} to get the {@link InteractionRuntime} for
@@ -108,6 +109,23 @@ public Optional getRuntime(GenericComponentInteractionCreate
return Optional.ofNullable(runtimes.get(split[2]));
}
+ /**
+ * Gets an {@link Optional} holding the {@link InteractionRuntime}. Returns an empty {@link Optional} if no
+ * {@link InteractionRuntime} has been created yet by calling
+ * {@link #newRuntime(GenericCommandInteractionEvent, GenericInteractionDefinition)}, if the underlying component wasn't
+ * created by jda-commands or if the {@link InteractionRuntime} expired.
+ *
+ * @param event the {@link ModalInteractionEvent} to get the {@link InteractionRuntime} for
+ * @return an {@link Optional} holding the {@link InteractionRuntime}
+ */
+ public Optional getRuntime(ModalInteractionEvent event) {
+ String[] split = event.getModalId().split("\\.");
+ if (split.length != 3) {
+ return Optional.empty();
+ }
+ return Optional.ofNullable(runtimes.get(split[2]));
+ }
+
/**
* A runtime used for executing interactions. This class holds the instance of the class annotated with
* {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction} where commands,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
index 499505be..453ea1b9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
@@ -1,6 +1,6 @@
package com.github.kaktushose.jda.commands.dispatching.adapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,10 +19,10 @@ public interface TypeAdapter {
* Attempts to parse a String to the given type.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed type or an empty Optional if the parsing fails
*/
- Optional parse(@NotNull String raw, @NotNull GenericContext context);
+ Optional parse(@NotNull String raw, @NotNull Context context);
/**
* Sanitizes a String containing a raw mention. This will remove all markdown characters namely < @ # & ! >
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
index 3f251c95..67eb68a2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
@@ -1,11 +1,11 @@
package com.github.kaktushose.jda.commands.dispatching.adapter;
import com.github.kaktushose.jda.commands.dispatching.adapter.impl.*;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.User;
@@ -31,7 +31,7 @@
public class TypeAdapterRegistry {
private static final Logger log = LoggerFactory.getLogger(TypeAdapterRegistry.class);
- private static final Map, Object> DEFAULT_MAPPINGS = new HashMap, Object>() {
+ private static final Map, Object> DEFAULT_MAPPINGS = new HashMap<>() {
{
put(byte.class, (byte) 0);
put(short.class, (short) 0);
@@ -128,19 +128,19 @@ public Optional> get(@Nullable Class type) {
}
/**
- * Takes a {@link CommandContext} and attempts to type adapt the command input to the type specified by the
- * {@link CommandDefinition}. Cancels the {@link CommandContext} if the type adapting fails.
+ * Takes a {@link SlashCommandContext} and attempts to type adapt the command input to the type specified by the
+ * {@link SlashCommandDefinition}. Cancels the {@link SlashCommandContext} if the type adapting fails.
*
- * @param context the {@link CommandContext} to type adapt
+ * @param context the {@link SlashCommandContext} to type adapt
*/
- public void adapt(@NotNull CommandContext context) {
- CommandDefinition command = Objects.requireNonNull(context.getCommand());
+ public void adapt(@NotNull SlashCommandContext context) {
+ SlashCommandDefinition command = Objects.requireNonNull(context.getCommand());
List arguments = new ArrayList<>();
String[] input = context.getInput();
ErrorMessageFactory messageFactory = context.getImplementationRegistry().getErrorMessageFactory();
log.debug("Type adapting arguments...");
- arguments.add(new CommandEvent(command, context));
+ arguments.add(new CommandEvent(context));
for (int i = 0; i < command.getActualParameters().size(); i++) {
ParameterDefinition parameter = command.getActualParameters().get(i);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
index 913116fd..02952a49 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
@@ -23,11 +23,11 @@ public class AudioChannelAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link AudioChannel}. Accepts both the channel id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link AudioChannel} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return Optional.empty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
index d9259afc..02586324 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -20,11 +20,11 @@ public class BooleanAdapter implements TypeAdapter {
* Parsing is case-insensitive .
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed boolean or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
if ("true".equalsIgnoreCase(raw) || "1".equals(raw)) {
return Optional.of(true);
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
index 8b375d70..e510e7a8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,11 +19,11 @@ public class ByteAdapter implements TypeAdapter {
* Attempts to parse a String to a Byte.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed Byte or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
try {
return Optional.of(Byte.valueOf(raw));
} catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
index 03ebd4a6..00e896e1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,11 +19,11 @@ public class CharacterAdapter implements TypeAdapter {
* Casts a String to a Char if and only if {@code raw.length == 1}. Else, returns an empty Optional.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed Char or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
if (raw.length() == 1) {
return Optional.of(raw.charAt(0));
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
index d19f0f03..9f27df25 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,11 +19,11 @@ public class DoubleAdapter implements TypeAdapter {
* Attempts to parse a String to a Double.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed Double or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
try {
return Optional.of(Double.valueOf(raw));
} catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
index 0cd3dbc6..3c219349 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,11 +19,11 @@ public class FloatAdapter implements TypeAdapter {
* Attempts to parse a String to a Float.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed Float or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
try {
return Optional.of(Float.valueOf(raw));
} catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
index 80830127..a4d37174 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@@ -22,11 +22,11 @@ public class GuildChannelAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link GuildChannel}. Accepts both the channel id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link GuildChannel} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return Optional.empty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
index c3adb3bb..2be2e4b1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@@ -23,11 +23,11 @@ public class GuildMessageChannelAdapter implements TypeAdapter parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return Optional.empty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
index 1a43d325..3b42e865 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,11 +19,11 @@ public class IntegerAdapter implements TypeAdapter {
* Attempts to parse a String to an Integer.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed Integer or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
try {
return Optional.of((int) Double.parseDouble(raw));
} catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
index d62667b2..5900ce92 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,11 +19,11 @@ public class LongAdapter implements TypeAdapter {
* Attempts to parse a String to a Long.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed Long or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
try {
return Optional.of((long) Double.parseDouble(raw));
} catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
index 803cc661..a0501b80 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.exceptions.ErrorResponseException;
@@ -22,11 +22,11 @@ public class MemberAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link Member}. Accepts both the member id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link Member} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
if (context.getEvent().getGuild() == null) {
return Optional.empty();
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
index 0f4b0ace..ac7cca37 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
@@ -22,11 +22,11 @@ public class NewsChannelAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link NewsChannel}. Accepts both the channel id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link NewsChannel} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return Optional.empty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
index cbed4480..b2662ee8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Role;
import org.jetbrains.annotations.NotNull;
@@ -21,11 +21,11 @@ public class RoleAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link Role}. Accepts both the role id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link Role} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
if (context.getEvent().getGuild() == null) {
return Optional.empty();
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
index 44c8c890..6c885fe8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
@@ -19,11 +19,11 @@ public class ShortAdapter implements TypeAdapter {
* Attempts to parse a String to a Short.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed Short or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
try {
return Optional.of(Short.valueOf(raw));
} catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
index a5b19e1e..aad0f8b1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.concrete.StageChannel;
@@ -22,11 +22,11 @@ public class StageChannelAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link StageChannel}. Accepts both the channel id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link StageChannel} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return Optional.empty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
index 5d959f41..609d9f6f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import org.jetbrains.annotations.NotNull;
@@ -21,11 +21,11 @@ public class TextChannelAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link TextChannel}. Accepts both the channel id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link TextChannel} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
if (context.getEvent().getGuild() == null) {
return Optional.empty();
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
index 75c40a5b..cf5d474e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
@@ -22,11 +22,11 @@ public class ThreadChannelAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link ThreadChannel}. Accepts both the channel id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link ThreadChannel} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return Optional.empty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
index 6efafd12..6d4d482d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.exceptions.ErrorResponseException;
@@ -22,11 +22,11 @@ public class UserAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link User}. Accepts both the user id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link User} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
User user;
raw = sanitizeMention(raw);
JDA jda = context.getEvent().getJDA();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
index bc6d127a..1b0c05be 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
@@ -22,11 +22,11 @@ public class VoiceChannelAdapter implements TypeAdapter {
* Attempts to parse a String to a {@link VoiceChannel}. Accepts both the channel id and name.
*
* @param raw the String to parse
- * @param context the {@link GenericContext}
+ * @param context the {@link Context}
* @return the parsed {@link VoiceChannel} or an empty Optional if the parsing fails
*/
@Override
- public Optional parse(@NotNull String raw, @NotNull GenericContext context) {
+ public Optional parse(@NotNull String raw, @NotNull Context context) {
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return Optional.empty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/Filter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/Filter.java
index 4efd0a51..31bee223 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/Filter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/Filter.java
@@ -1,11 +1,11 @@
package com.github.kaktushose.jda.commands.dispatching.filter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
/**
- * Generic top level interface for the filter chain. A filter performs filtering tasks on a {@link GenericContext}
- * before execution. A filter might modify the {@link GenericContext} or even cancel the whole event.
+ * Generic top level interface for the filter chain. A filter performs filtering tasks on a {@link Context}
+ * before execution. A filter might modify the {@link Context} or even cancel the whole event.
*
* @author Kaktushose
* @version 2.0.0
@@ -14,11 +14,11 @@
public interface Filter {
/**
- * Performs the filtering on a {@link GenericContext} object. Use {@link GenericContext#setCancelled(boolean)} to
- * indicate that the {@link GenericContext} didn't pass the filter.
+ * Performs the filtering on a {@link Context} object. Use {@link Context#setCancelled(boolean)} to
+ * indicate that the {@link Context} didn't pass the filter.
*
- * @param context the {@link GenericContext} to filter
+ * @param context the {@link Context} to filter
*/
- void apply(@NotNull GenericContext context);
+ void apply(@NotNull Context context);
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/FilterRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/FilterRegistry.java
index 8f5f0b39..9ecbb35d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/FilterRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/FilterRegistry.java
@@ -2,7 +2,7 @@
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
import com.github.kaktushose.jda.commands.dispatching.filter.impl.*;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,13 +113,13 @@ public enum FilterPosition {
/**
* Filter will be executed before command routing. The command will not be present in the
- * {@link CommandContext}.
+ * {@link SlashCommandContext}.
*/
BEFORE_ROUTING,
/**
* Filter will be executed before type adapting. The command will be present in the
- * {@link CommandContext} but not the type adapted input.
+ * {@link SlashCommandContext} but not the type adapted input.
*/
BEFORE_ADAPTING,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/ConstraintFilter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/ConstraintFilter.java
index 0416cc84..22859584 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/ConstraintFilter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/ConstraintFilter.java
@@ -1,11 +1,11 @@
package com.github.kaktushose.jda.commands.dispatching.filter.impl;
import com.github.kaktushose.jda.commands.dispatching.filter.Filter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,7 +15,7 @@
/**
* A {@link Filter} implementation that will check the parameter constraints a
- * {@link CommandDefinition} might have.
+ * {@link SlashCommandDefinition} might have.
*
* @author Kaktushose
* @version 2.0.0
@@ -27,14 +27,14 @@ public class ConstraintFilter implements Filter {
private static final Logger log = LoggerFactory.getLogger(ConstraintFilter.class);
/**
- * Checks if all parameters fulfill their constraints. Will cancel the {@link GenericContext} if a parameter
+ * Checks if all parameters fulfill their constraints. Will cancel the {@link Context} if a parameter
* constraint fails.
*
- * @param ctx the {@link GenericContext} to filter
+ * @param ctx the {@link Context} to filter
*/
@Override
- public void apply(@NotNull GenericContext ctx) {
- CommandContext context = (CommandContext) ctx;
+ public void apply(@NotNull Context ctx) {
+ SlashCommandContext context = (SlashCommandContext) ctx;
List arguments = context.getArguments();
List parameters = Objects.requireNonNull(context.getCommand()).getParameters();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/CooldownFilter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/CooldownFilter.java
index 247158fe..f0abb955 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/CooldownFilter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/CooldownFilter.java
@@ -2,10 +2,10 @@
import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
import com.github.kaktushose.jda.commands.dispatching.filter.Filter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,7 +15,7 @@
/**
* A {@link Filter} implementation that contains the business logic behind command cooldowns.
* If the command isn't annotated with {@link Cooldown Cooldown} or more
- * formally if the {@link CommandDefinition} doesn't hold a {@link CooldownDefinition} or the delay of the
+ * formally if the {@link SlashCommandDefinition} doesn't hold a {@link CooldownDefinition} or the delay of the
* {@link CooldownDefinition} amounts to {@code 0} this filter has no effect.
*
* @author Kaktushose
@@ -33,14 +33,14 @@ public CooldownFilter() {
}
/**
- * Checks if an active cooldown for the given {@link CommandDefinition} exists and will eventually cancel the
+ * Checks if an active cooldown for the given {@link SlashCommandDefinition} exists and will eventually cancel the
* context.
*
- * @param context the {@link GenericContext} to filter
+ * @param context the {@link Context} to filter
*/
@Override
- public void apply(@NotNull GenericContext context) {
- CommandDefinition command = ((CommandContext) context).getCommand();
+ public void apply(@NotNull Context context) {
+ SlashCommandDefinition command = ((SlashCommandContext) context).getCommand();
if (!command.hasCooldown()) {
return;
@@ -73,17 +73,17 @@ public void apply(@NotNull GenericContext context) {
}
private static class CooldownEntry {
- private final CommandDefinition command;
+ private final SlashCommandDefinition command;
private final long startTime;
private final long duration;
- public CooldownEntry(CommandDefinition command, long startTime, long duration) {
+ public CooldownEntry(SlashCommandDefinition command, long startTime, long duration) {
this.command = command;
this.startTime = startTime;
this.duration = duration;
}
- public CommandDefinition getCommand() {
+ public SlashCommandDefinition getCommand() {
return command;
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/DirectMessageFilter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/DirectMessageFilter.java
index d520be07..4cf81f58 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/DirectMessageFilter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/DirectMessageFilter.java
@@ -2,9 +2,9 @@
import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
import com.github.kaktushose.jda.commands.dispatching.filter.Filter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import org.jetbrains.annotations.NotNull;
@@ -13,7 +13,7 @@
/**
* A {@link Filter} implementation that checks if a
- * {@link CommandDefinition} is available for execution in direct messages.
+ * {@link SlashCommandDefinition} is available for execution in direct messages.
*
* @author Kaktushose
* @version 2.0.0
@@ -25,14 +25,14 @@ public class DirectMessageFilter implements Filter {
private static final Logger log = LoggerFactory.getLogger(DirectMessageFilter.class);
/**
- * Checks if a {@link CommandDefinition} is available for execution in
- * direct messages and if not cancels the {@link GenericContext},
+ * Checks if a {@link SlashCommandDefinition} is available for execution in
+ * direct messages and if not cancels the {@link Context},
*
- * @param context the {@link GenericContext} to filter
+ * @param context the {@link Context} to filter
*/
@Override
- public void apply(@NotNull GenericContext context) {
- CommandContext commandContext = (CommandContext) context;
+ public void apply(@NotNull Context context) {
+ SlashCommandContext commandContext = (SlashCommandContext) context;
Channel channel = context.getEvent().getChannel();
if (channel == null) {
return;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/PermissionsFilter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/PermissionsFilter.java
index 80f59c3a..5a1489b8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/PermissionsFilter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/PermissionsFilter.java
@@ -2,8 +2,8 @@
import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
import com.github.kaktushose.jda.commands.dispatching.filter.Filter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
@@ -16,9 +16,9 @@
* A {@link Filter} implementation that will check permissions.
* The default implementation can only handle discord permissions. However, the {@link PermissionsProvider} can be
* used for own implementations.
- * This filter will first check against {@link PermissionsProvider#hasPermission(User, GenericContext)} with a
+ * This filter will first check against {@link PermissionsProvider#hasPermission(User, Context)} with a
* {@link User} object. This can be used for global permissions. Afterwards
- * {@link PermissionsProvider#hasPermission(Member, GenericContext)} will be called. Since the {@link Member} is
+ * {@link PermissionsProvider#hasPermission(Member, Context)} will be called. Since the {@link Member} is
* available this might be used for guild related permissions.
*
* @author Kaktushose
@@ -34,10 +34,10 @@ public class PermissionsFilter implements Filter {
/**
* Checks if the {@link User} and respectively the {@link Member} has the permission to execute the command.
*
- * @param context the {@link GenericContext} to filter
+ * @param context the {@link Context} to filter
*/
@Override
- public void apply(@NotNull GenericContext context) {
+ public void apply(@NotNull Context context) {
log.debug("Checking permissions...");
PermissionsProvider provider = context.getImplementationRegistry().getPermissionsProvider();
@@ -51,7 +51,7 @@ public void apply(@NotNull GenericContext context) {
}
if (!hasPerms) {
context.setCancelled(true).setErrorMessage(
- context.getImplementationRegistry().getErrorMessageFactory().getInsufficientPermissionsMessage((CommandContext) context)
+ context.getImplementationRegistry().getErrorMessageFactory().getInsufficientPermissionsMessage((SlashCommandContext) context)
);
log.debug("Insufficient permissions!");
return;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/UserMuteFilter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/UserMuteFilter.java
index b53aa880..d4e01ab9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/UserMuteFilter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/filter/impl/UserMuteFilter.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.filter.impl;
import com.github.kaktushose.jda.commands.dispatching.filter.Filter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
import net.dv8tion.jda.api.entities.User;
import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@
*
* @author Kaktushose
* @version 2.0.0
- * @see PermissionsProvider#isMuted(User, GenericContext)
+ * @see PermissionsProvider#isMuted(User, Context)
* @since 2.0.0
*/
public class UserMuteFilter implements Filter {
@@ -25,12 +25,12 @@ public class UserMuteFilter implements Filter {
private static final Logger log = LoggerFactory.getLogger(UserMuteFilter.class);
/**
- * Checks if a {@link User} is muted and will cancel the {@link GenericContext} if he is.
+ * Checks if a {@link User} is muted and will cancel the {@link Context} if he is.
*
- * @param context the {@link GenericContext} to filter
+ * @param context the {@link Context} to filter
*/
@Override
- public void apply(@NotNull GenericContext context) {
+ public void apply(@NotNull Context context) {
log.debug("Checking mutes...");
PermissionsProvider provider = context.getImplementationRegistry().getPermissionsProvider();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
similarity index 78%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericContext.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
index f612a8b3..c47d642f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
@@ -4,7 +4,7 @@
import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime;
import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteraction;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
@@ -22,16 +22,16 @@
* @see GenericEvent
* @since 2.0.0
*/
-public class GenericContext {
+public class Context {
- protected final T event;
+ protected final GenericInteractionCreateEvent event;
protected MessageCreateData errorMessage;
protected ImplementationRegistry registry;
protected JDACommands jdaCommands;
protected boolean cancelled;
protected boolean ephemeral;
protected InteractionRuntime runtime;
- protected GenericInteraction interaction;
+ protected GenericInteractionDefinition interactionDefinition;
/**
* Constructs a new GenericContext.
@@ -39,13 +39,13 @@ public class GenericContext {
* @param jdaCommands the corresponding {@link JDACommands} instance
* @param event the corresponding {@link GenericInteractionCreateEvent}
*/
- public GenericContext(T event, JDACommands jdaCommands) {
+ public Context(GenericInteractionCreateEvent event, JDACommands jdaCommands) {
this.event = event;
this.jdaCommands = jdaCommands;
this.registry = jdaCommands.getImplementationRegistry();
}
- public T getEvent() {
+ public GenericInteractionCreateEvent getEvent() {
return event;
}
@@ -66,7 +66,7 @@ public MessageCreateData getErrorMessage() {
* @return the current CommandContext instance
*/
@NotNull
- public GenericContext setErrorMessage(@NotNull MessageCreateData message) {
+ public Context setErrorMessage(@NotNull MessageCreateData message) {
this.errorMessage = message;
return this;
}
@@ -88,7 +88,7 @@ public ImplementationRegistry getImplementationRegistry() {
* @return the current CommandContext instance
*/
@NotNull
- public GenericContext setImplementationRegistry(@NotNull ImplementationRegistry registry) {
+ public Context setImplementationRegistry(@NotNull ImplementationRegistry registry) {
this.registry = registry;
return this;
}
@@ -110,7 +110,7 @@ public JDACommands getJdaCommands() {
* @return the current CommandContext instance
*/
@NotNull
- public GenericContext setJdaCommands(@NotNull JDACommands jdaCommands) {
+ public Context setJdaCommands(@NotNull JDACommands jdaCommands) {
this.jdaCommands = jdaCommands;
return this;
}
@@ -131,7 +131,7 @@ public boolean isCancelled() {
* @return the current CommandContext instance
*/
@NotNull
- public GenericContext setCancelled(final boolean cancelled) {
+ public Context setCancelled(final boolean cancelled) {
this.cancelled = cancelled;
return this;
}
@@ -140,7 +140,7 @@ public boolean isEphemeral() {
return ephemeral;
}
- public GenericContext setEphemeral(boolean ephemeral) {
+ public Context setEphemeral(boolean ephemeral) {
this.ephemeral = ephemeral;
return this;
}
@@ -159,17 +159,17 @@ public InteractionRuntime getRuntime() {
*
* @return the current CommandContext instance
*/
- public GenericContext setRuntime(InteractionRuntime runtime) {
+ public Context setRuntime(InteractionRuntime runtime) {
this.runtime = runtime;
return this;
}
- public GenericInteraction getInteraction() {
- return interaction;
+ public GenericInteractionDefinition getInteractionDefinition() {
+ return interactionDefinition;
}
- public GenericContext setInteraction(GenericInteraction interaction) {
- this.interaction = interaction;
+ public Context setInteractionDefinition(GenericInteractionDefinition interactionDefinition) {
+ this.interactionDefinition = interactionDefinition;
return this;
}
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
index 157b233a..7cc87650 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
@@ -1,48 +1,47 @@
package com.github.kaktushose.jda.commands.dispatching.interactions;
import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
import com.github.kaktushose.jda.commands.dispatching.filter.FilterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandDispatcher;
import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
/**
* Abstract base class for event dispatchers.
*
- * @param the subclass of {@link GenericContext} to dispatch
* @author Kaktushose
* @version 4.0.0
- * @see CommandDispatcher CommandDispatcher
* @since 4.0.0
*/
-public abstract class GenericDispatcher> {
+public abstract class GenericDispatcher {
+ protected final JDACommands jdaCommands;
protected final FilterRegistry filterRegistry;
protected final ImplementationRegistry implementationRegistry;
protected final InteractionRegistry interactionRegistry;
protected final TypeAdapterRegistry adapterRegistry;
+ protected final RuntimeSupervisor runtimeSupervisor;
/**
* Constructs a new GenericDispatcher.
*
- * @param supervisor the {@link DispatcherSupervisor} which supervises this dispatcher.
+ * @param jdaCommands the corresponding {@link JDACommands} instance.
*/
- public GenericDispatcher(DispatcherSupervisor supervisor) {
- JDACommands jdaCommands = supervisor.getJdaCommands();
+ public GenericDispatcher(JDACommands jdaCommands) {
+ this.jdaCommands = jdaCommands;
filterRegistry = jdaCommands.getFilterRegistry();
implementationRegistry = jdaCommands.getImplementationRegistry();
interactionRegistry = jdaCommands.getInteractionRegistry();
adapterRegistry = jdaCommands.getAdapterRegistry();
+ runtimeSupervisor = jdaCommands.getRuntimeSupervisor();
}
/**
- * Dispatches a {@link GenericContext}.
+ * Dispatches a {@link Context}.
*
- * @param context the {@link GenericContext} to dispatch.
+ * @param context the {@link Context} to dispatch.
*/
- public abstract void onEvent(T context);
+ public abstract void onEvent(Context context);
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
index 5828c48c..eebf50de 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
@@ -1,330 +1,61 @@
package com.github.kaktushose.jda.commands.dispatching.interactions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.buttons.ButtonEvent;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
-import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import net.dv8tion.jda.api.events.Event;
+import com.github.kaktushose.jda.commands.JDACommands;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
/**
- * Extension of JDAs {@link Event} class that combines all common fields of all interaction events. This is the base
- * class for the different event classes.
+ * Extension of JDAs {@link GenericInteractionCreateEvent} class. This is the base class for the different event classes.
*
* @author Kaktushose
* @version 4.0.0
- * @see CommandEvent CommandEvent
- * @see ButtonEvent ButtonEvent
+ * @see com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent CommandEvent
+ * @see com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent ComponentEvent
+ * @see com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteEvent AutoCompleteEvent
+ * @see com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalEvent ModalEvent
* @since 4.0.0
*/
-public class GenericEvent extends Event {
-
- private final Guild guild;
- private final User user;
- private final Member member;
- private final MessageChannel channel;
- private final ChannelType channelType;
- private final Message message;
- private final Map values;
-
-
- protected GenericEvent(JDA api, long responseNumber, Guild guild, User user, Member member,
- MessageChannel channel, ChannelType channelType, Message message) {
- super(api, responseNumber);
- this.guild = guild;
- this.user = user;
- this.member = member;
- this.channel = channel;
- this.channelType = channelType;
- this.message = message;
- this.values = new ConcurrentHashMap<>();
- }
-
- protected GenericEvent(GenericEvent event) {
- this(event.getJDA(), event.getResponseNumber(), event.getGuild(), event.getUser(), event.getMember(),
- event.getChannel(), event.getChannelType(), event.getMessage());
- }
-
- /**
- * Constructs a new {@link GenericEvent} from a {@link SlashCommandInteractionEvent}.
- *
- * @param event the {@link SlashCommandInteractionEvent} to construct from
- * @return a {@link GenericEvent}
- */
- @NotNull
- public static GenericEvent fromEvent(@NotNull GenericInteractionCreateEvent event) {
- return new GenericEvent(event.getJDA(), event.getResponseNumber(), event.getGuild(),
- event.getUser(), event.getMember(), event.getMessageChannel(), event.getChannelType(), null);
- }
-
- /**
- * The {@link Guild} the Message was received in.
- * extends GenericInteractionCreateEvent {
- /**
- * The {@link ThreadChannel} the Message was received in.
- * the type of the value
- * @return an {@link Optional} holding the value
- */
- public Optional get(String key, @NotNull Class clazz) {
- return Optional.ofNullable(values.get(key)).filter(it -> it.getClass().isAssignableFrom(clazz)).map(clazz::cast);
- }
+ private final T definition;
+ protected final Context context;
/**
- * Associates the specified value with the specified key.
+ * Constructs a new GenericEvent.
*
- * @param key the key
- * @param value the value
- * @return this instance for fluent interface
+ * @param context the underlying {@link Context}
*/
- public GenericEvent put(String key, Object value) {
- values.put(key, value);
- return this;
+ @SuppressWarnings("unchecked")
+ protected GenericEvent(Context context) {
+ super(context.getEvent().getJDA(), context.getEvent().getResponseNumber(), context.getEvent().getInteraction());
+ definition = (T) context.getInteractionDefinition();
+ this.context = context;
}
/**
- * Whether this StateSection has a value mapped to the key.
+ * Get the interaction object which describes the component that is executed.
*
- * @param key the key
- * @return {@code true} if this StateSection has a value mapped to the key
+ * @return the underlying interaction object
*/
- public boolean contains(String key) {
- return values.containsKey(key);
+ public T getInteractionDefinition() {
+ return definition;
}
/**
- * Removes the value mapping for a key.
+ * Get the {@link Context} object.
*
- * @param key key whose mapping is to be removed
- * @return this instance for fluent interface
+ * @return the registered {@link Context} object
*/
- public GenericEvent remove(String key) {
- values.remove(key);
- return this;
+ public Context getContext() {
+ return context;
}
/**
- * Removes all the value mappings.
+ * Get the {@link JDACommands} object.
*
- * @return this instance for fluent interface
+ * @return the {@link JDACommands} object
*/
- public GenericEvent clear() {
- values.clear();
- return this;
+ public JDACommands getJdaCommands() {
+ return context.getJdaCommands();
}
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericParser.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericParser.java
deleted file mode 100644
index 734193b0..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericParser.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandDispatcher;
-import net.dv8tion.jda.api.events.GenericEvent;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Abstract toplevel class for defining event parsers.
- *
- * @param a subtype of {@link GenericEvent} the parser can parse
- * @author Kaktushose
- * @version 2.0.0
- * @since 2.0.0
- */
-public abstract class GenericParser {
-
- public GenericContext parseInternal(GenericEvent event, JDACommands jdaCommands) {
- return parse((T) event, jdaCommands);
- }
-
- /**
- * Takes a subtype of {@link GenericEvent}, parses and transpiles it into a {@link GenericContext}.
- *
- * @param event the subtype of {@link GenericEvent}
- * @param dispatcher the calling {@link CommandDispatcher}
- * @return a new {@link GenericContext}
- */
- @NotNull
- public abstract GenericContext parse(@NotNull T event, @NotNull JDACommands jdaCommands);
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteContext.java
deleted file mode 100644
index a70da90f..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteContext.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
-
-public class AutoCompleteContext extends GenericContext {
-
- /**
- * Constructs a new AutoCompleteContext.
- *
- * @param event the corresponding {@link CommandAutoCompleteInteractionEvent}
- * @param jdaCommands the corresponding {@link JDACommands} instance
- */
- public AutoCompleteContext(CommandAutoCompleteInteractionEvent event, JDACommands jdaCommands) {
- super(event, jdaCommands);
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
index 28270542..ff0cd44f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete;
-import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.JDACommands;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
@@ -11,32 +11,28 @@
import java.util.Optional;
/**
- * Dispatches auto complete by taking a {@link AutoCompleteContext} and passing it through the execution chain.
+ * Dispatches auto complete by taking a {@link Context} and passing it through the execution chain.
*
* @author Kaktushose
* @version 4.0.0
* @since 4.0.0
*/
-public class AutoCompleteDispatcher extends GenericDispatcher {
+public class AutoCompleteDispatcher extends GenericDispatcher {
private static final Logger log = LoggerFactory.getLogger(AutoCompleteDispatcher.class);
- private final RuntimeSupervisor runtimeSupervisor;
/**
* Constructs a new AutoCompleteDispatcher.
*
- * @param supervisor the {@link DispatcherSupervisor} which supervises this dispatcher.
- * @param runtimeSupervisor the corresponding {@link RuntimeSupervisor}
+ * @param jdaCommands the corresponding {@link JDACommands} instance.
*/
- public AutoCompleteDispatcher(DispatcherSupervisor supervisor, RuntimeSupervisor runtimeSupervisor) {
- super(supervisor);
- this.runtimeSupervisor = runtimeSupervisor;
+ public AutoCompleteDispatcher(JDACommands jdaCommands) {
+ super(jdaCommands);
}
@Override
- public void onEvent(AutoCompleteContext context) {
- log.debug("Acknowledging event");
- CommandAutoCompleteInteractionEvent event = context.getEvent();
+ public void onEvent(Context context) {
+ CommandAutoCompleteInteractionEvent event = (CommandAutoCompleteInteractionEvent) context.getEvent();
Optional optionalAutoComplete = interactionRegistry.getAutoCompletes().stream()
.filter(it -> it.getCommandNames().contains(event.getFullCommandName()))
.findFirst();
@@ -47,6 +43,8 @@ public void onEvent(AutoCompleteContext context) {
}
AutoCompleteDefinition autoComplete = optionalAutoComplete.get();
+ log.debug("Input matches auto complete: {}", autoComplete.getId());
+
log.info("Executing auto complete {} for user {}", autoComplete.getMethod().getName(), event.getMember());
try {
autoComplete.getMethod().invoke(runtimeSupervisor.getOrCreateInstance(event, autoComplete), new AutoCompleteEvent(context));
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
index d16420df..bcbfaead 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
@@ -1,6 +1,8 @@
package com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
+import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.interactions.commands.Command;
import net.dv8tion.jda.api.interactions.commands.CommandAutoCompleteInteraction;
@@ -21,13 +23,13 @@
* @see GenericEvent
* @since 4.0.0
*/
-public class AutoCompleteEvent extends GenericEvent {
+public class AutoCompleteEvent extends GenericEvent {
private final CommandAutoCompleteInteractionEvent event;
- protected AutoCompleteEvent(AutoCompleteContext context) {
- super(GenericEvent.fromEvent(context.getEvent()));
- event = context.getEvent();
+ protected AutoCompleteEvent(Context context) {
+ super(context);
+ event = (CommandAutoCompleteInteractionEvent) context.getEvent();
}
/**
@@ -260,7 +262,7 @@ public String getValue() {
* @return The option type expected from this auto-complete response
*/
@Nonnull
- public OptionType getType() {
+ public OptionType getOptionType() {
return event.getFocusedOption().getType();
}
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteParser.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteParser.java
deleted file mode 100644
index 0a3a2a2c..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteParser.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericParser;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
-import org.jetbrains.annotations.NotNull;
-
-public class AutoCompleteParser extends GenericParser {
-
- @Override
- public @NotNull GenericContext parse(@NotNull CommandAutoCompleteInteractionEvent event, @NotNull JDACommands jdaCommands) {
- return new AutoCompleteContext(event, jdaCommands);
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonContext.java
deleted file mode 100644
index 305ac870..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonContext.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.buttons;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.ButtonDefinition;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-
-/**
- * Implementation of {@link GenericContext} for {@link ButtonInteractionEvent}.
- *
- * @author Kaktushose
- * @version 4.0.0
- * @since 4.0.0
- */
-public class ButtonContext extends GenericContext {
-
- private ButtonDefinition button;
-
- /**
- * Constructs a new ButtonContext.
- *
- * @param event the corresponding {@link ButtonInteractionEvent}
- * @param jdaCommands the corresponding {@link JDACommands} instance
- */
- public ButtonContext(ButtonInteractionEvent event, JDACommands jdaCommands) {
- super(event, jdaCommands);
- }
-
- /**
- * Gets the {@link ButtonDefinition}.
- *
- * @return the {@link ButtonDefinition}
- */
- public ButtonDefinition getButton() {
- return button;
- }
-
- /**
- * Set the {@link ButtonDefinition}.
- *
- * @param button the {@link ButtonDefinition}
- * @return the current CommandContext instance
- */
- public ButtonContext setButton(ButtonDefinition button) {
- this.button = button;
- setInteraction(button);
- return this;
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonDispatcher.java
deleted file mode 100644
index beb74f66..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonDispatcher.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.buttons;
-
-import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.interactions.ButtonDefinition;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Optional;
-
-/**
- * Dispatches buttons by taking a {@link ButtonContext} and passing it through the execution chain.
- *
- * @author Kaktushose
- * @version 4.0.0
- * @since 4.0.0
- */
-public class ButtonDispatcher extends GenericDispatcher {
-
- private static final Logger log = LoggerFactory.getLogger(ButtonDispatcher.class);
- private final RuntimeSupervisor runtimeSupervisor;
-
- /**
- * Constructs a new ButtonDispatcher.
- *
- * @param supervisor the {@link DispatcherSupervisor} which supervises this dispatcher.
- * @param runtimeSupervisor the corresponding {@link RuntimeSupervisor}
- */
- public ButtonDispatcher(DispatcherSupervisor supervisor, RuntimeSupervisor runtimeSupervisor) {
- super(supervisor);
- this.runtimeSupervisor = runtimeSupervisor;
- }
-
- /**
- * Dispatches a {@link ButtonContext}.
- *
- * @param context the {@link ButtonContext} to dispatch.
- */
- @Override
- public void onEvent(ButtonContext context) {
- log.debug("Acknowledging event");
- ButtonInteractionEvent event = context.getEvent();
- event.deferEdit().queue();
-
- ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
-
- Optional optionalRuntime = runtimeSupervisor.getRuntime(event);
- if (optionalRuntime.isEmpty()) {
- event.getHook().editOriginalComponents().queue();
- event.getHook().sendMessage(messageFactory.getUnknownInteractionMessage(context)).setEphemeral(true).queue();
- return;
- }
- InteractionRuntime runtime = optionalRuntime.get();
- log.debug("Found corresponding runtime with id \"{}\"", runtime);
-
- String[] splitId = event.getButton().getId().split("\\.");
- String buttonId = String.format("%s.%s", splitId[0], splitId[1]);
- Optional optionalButton = interactionRegistry.getButtons().stream()
- .filter(it -> it.getId().equals(buttonId))
- .findFirst();
- if (optionalButton.isEmpty()) {
- IllegalStateException exception = new IllegalStateException(
- "No button found! Please report this error the the devs of jda-commands."
- );
- context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, exception));
- checkCancelled(context);
- throw exception;
- }
-
- ButtonDefinition button = optionalButton.get();
- context.setButton(button).setEphemeral(button.isEphemeral());
- log.debug("Input matches button: {}", button);
-
- log.info("Executing button {} for user {}", button.getMethod().getName(), event.getMember());
- try {
- context.setRuntime(runtime);
- button.getMethod().invoke(runtime.getInstance(), new ButtonEvent(button, context));
- } catch (Exception exception) {
- log.error("Button execution failed!", exception);
- // this unwraps the underlying error in case of an exception inside the command class
- Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
- context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, throwable));
- checkCancelled(context);
- }
- }
-
- @SuppressWarnings("ConstantConditions")
- private boolean checkCancelled(ButtonContext context) {
- if (context.isCancelled()) {
- ReplyContext replyContext = new ReplyContext(context);
- replyContext.getBuilder().applyData(context.getErrorMessage());
- replyContext.queue();
- return true;
- }
- return false;
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonEvent.java
deleted file mode 100644
index 26e7be06..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonEvent.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.buttons;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-import com.github.kaktushose.jda.commands.reflect.interactions.ButtonDefinition;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Optional;
-
-/**
- * This class is a subclass of {@link GenericEvent}.
- * It provides additional features for sending messages or editing the original message and also grants
- * access to the {@link ButtonDefinition} object which describes the button interaction that is executed.
- *
- * @author Kaktushose
- * @version 2.3.0
- * @see GenericEvent
- * @see Replyable
- * @since 1.0.0
- */
-public class ButtonEvent extends GenericEvent implements Replyable {
-
- private final ButtonDefinition button;
- private final ButtonContext context;
- private final ReplyContext replyContext;
-
- /**
- * Constructs a ButtonEvent.
- *
- * @param button the underlying {@link ButtonDefinition} object
- * @param context the {@link ButtonContext}
- */
- public ButtonEvent(@NotNull ButtonDefinition button, @NotNull ButtonContext context) {
- super(GenericEvent.fromEvent(context.getEvent()));
- this.button = button;
- this.context = context;
- replyContext = new ReplyContext(context);
- }
-
- /**
- * Get the {@link ButtonDefinition} object which describes the button that is executed.
- *
- * @return the underlying {@link ButtonDefinition} object
- */
- public ButtonDefinition getButtonDefinition() {
- return button;
- }
-
- /**
- * Get the {@link JDACommands} object.
- *
- * @return the {@link JDACommands} object
- */
- public JDACommands getJdaCommands() {
- return context.getJdaCommands();
- }
-
- /**
- * Get the {@link ButtonContext} object.
- *
- * @return the registered {@link ButtonContext} object
- */
- @Override
- public ButtonContext getContext() {
- return context;
- }
-
- @Override
- public @NotNull ReplyContext getReplyContext() {
- return replyContext;
- }
-
- @Override
- public void reply() {
- Optional optional = context.getRuntime().getLatestReply();
- if (optional.isPresent()) {
- MessageCreateData cached = optional.get();
- if (replyContext.isKeepComponents() && replyContext.getBuilder().getComponents().isEmpty()) {
- replyContext.getBuilder().setComponents(cached.getComponents());
- }
-
- }
- replyContext.queue();
- context.getRuntime().setLatestReply(replyContext.toMessageCreateData());
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonParser.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonParser.java
deleted file mode 100644
index f8a0c64c..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/buttons/ButtonParser.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.buttons;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericParser;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * An implementation of {@link GenericParser} that can parse {@link ButtonInteractionEvent}.
- *
- * @author Kaktushose
- * @version 4.0.0
- * @since 4.0.0
- */
-public class ButtonParser extends GenericParser {
-
- /**
- * Takes a {@link ButtonInteractionEvent}, parses and transpiles it into a {@link ButtonContext}.
- *
- * @param event the {@link SlashCommandInteractionEvent} to parse
- * @param jdaCommands the {@link JDACommands} instance
- * @return a new {@link ButtonContext}
- */
- @Override
- public @NotNull GenericContext parse(@NotNull ButtonInteractionEvent event, @NotNull JDACommands jdaCommands) {
- return new ButtonContext(event, jdaCommands);
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
index 094cbd48..821d0575 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
@@ -1,14 +1,17 @@
package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
-import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
+import com.github.kaktushose.jda.commands.JDACommands;
import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime;
-import com.github.kaktushose.jda.commands.dispatching.filter.Filter;
-import com.github.kaktushose.jda.commands.dispatching.filter.FilterRegistry.FilterPosition;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
+import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent;
+import net.dv8tion.jda.api.interactions.commands.Command;
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,101 +23,80 @@
import java.util.Optional;
/**
- * Dispatches commands by taking a {@link CommandContext} and passing it through the execution chain.
+ * Dispatches command events.
*
* @author Kaktushose
* @version 4.0.0
- * @since 2.0.0
+ * @since 4.0.0
*/
-public class CommandDispatcher extends GenericDispatcher {
+public class CommandDispatcher extends GenericDispatcher {
private static final Logger log = LoggerFactory.getLogger(CommandDispatcher.class);
- private final RuntimeSupervisor runtimeSupervisor;
/**
- * Constructs a new ButtonDispatcher.
+ * Constructs a new GenericDispatcher.
*
- * @param supervisor the {@link DispatcherSupervisor} which supervises this dispatcher.
- * @param runtimeSupervisor the corresponding {@link RuntimeSupervisor}
+ * @param jdaCommands the corresponding {@link JDACommands} instance.
*/
- public CommandDispatcher(DispatcherSupervisor supervisor, RuntimeSupervisor runtimeSupervisor) {
- super(supervisor);
- this.runtimeSupervisor = runtimeSupervisor;
+ public CommandDispatcher(JDACommands jdaCommands) {
+ super(jdaCommands);
}
- /**
- * Dispatches a {@link CommandContext}. This will route the command, apply all filters and parse the arguments.
- * Finally, the command will be executed.
- *
- * @param context the {@link CommandContext} to dispatch.
- */
- public void onEvent(CommandContext context) {
+ @Override
+ public void onEvent(Context context) {
+ GenericCommandInteractionEvent event = (GenericCommandInteractionEvent) context.getEvent();
ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
- log.debug("Applying filters in phase BEFORE_ROUTING...");
- for (Filter filter : filterRegistry.getAll(FilterPosition.BEFORE_ROUTING)) {
- filter.apply(context);
- if (checkCancelled(context)) {
- return;
- }
- }
-
- Optional optional = interactionRegistry.getCommands().stream()
- .filter(it -> it.getName().equals(context.getEvent().getFullCommandName()))
+ Optional optional = interactionRegistry.getCommands().stream()
+ .filter(it -> it.getName().equals(event.getFullCommandName()))
.findFirst();
+
if (optional.isEmpty()) {
- IllegalStateException exception = new IllegalStateException(
- "No slash command found! Please report this error the the devs of jda-commands."
- );
+ IllegalStateException exception = new IllegalStateException("No command found! Please report this error the the devs of jda-commands.");
context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, exception));
checkCancelled(context);
throw exception;
}
- CommandDefinition command = optional.get();
- context.setCommand(command).setEphemeral(command.isEphemeral());
- log.debug("Input matches command: {}", command);
-
- log.debug("Acknowledging event");
- context.getEvent().deferReply(context.isEphemeral()).queue();
-
- List parameters = new ArrayList<>();
- Map options = context.getOptionsAsMap();
- command.getActualParameters().forEach(param -> {
- if (!options.containsKey(param.getName())) {
+ GenericCommandDefinition command = optional.get();
+ context.setInteractionDefinition(command).setEphemeral(command.isEphemeral());
+ log.debug("Input matches command: {}", command.getId());
+
+ List arguments;
+ if (command.getCommandType() == Command.Type.SLASH) {
+ SlashCommandDefinition slashCommand = (SlashCommandDefinition) command;
+ SlashCommandContext slashContext = (SlashCommandContext) context;
+ slashContext.setCommand(slashCommand);
+
+ Map options = slashContext.getOptionsAsMap();
+ List parameters = new ArrayList<>();
+ slashCommand.getActualParameters().forEach(param -> {
+ if (!options.containsKey(param.getName())) {
+ return;
+ }
+ parameters.add(options.get(param.getName()).getAsString());
+ });
+ slashContext.setInput(parameters.toArray(new String[]{}));
+
+ adapterRegistry.adapt(slashContext);
+ if (checkCancelled(slashContext)) {
return;
}
- parameters.add(options.get(param.getName()).getAsString());
- });
- context.setInput(parameters.toArray(new String[]{}));
-
- log.debug("Applying filters in phase BEFORE_ADAPTING...");
- for (Filter filter : filterRegistry.getAll(FilterPosition.BEFORE_ADAPTING)) {
- filter.apply(context);
- if (checkCancelled(context)) {
- return;
- }
- }
- adapterRegistry.adapt(context);
- if (checkCancelled(context)) {
- return;
- }
-
- log.debug("Applying filters in phase BEFORE_EXECUTION...");
- for (Filter filter : filterRegistry.getAll(FilterPosition.BEFORE_EXECUTION)) {
- filter.apply(context);
- if (checkCancelled(context)) {
- return;
- }
+ arguments = slashContext.getArguments();
+ } else {
+ arguments = new ArrayList<>() {{
+ add(new CommandEvent(context));
+ add(((GenericContextInteractionEvent) event).getTarget());
+ }};
}
log.info("Executing command {} for user {}", command.getMethod().getName(), context.getEvent().getMember());
try {
- InteractionRuntime runtime = runtimeSupervisor.newRuntime(context.getEvent(), command);
+ RuntimeSupervisor.InteractionRuntime runtime = runtimeSupervisor.newRuntime(event, command);
context.setRuntime(runtime);
- log.debug("Invoking method with following arguments: {}", context.getArguments());
- command.getMethod().invoke(runtime.getInstance(), context.getArguments().toArray());
+ log.debug("Invoking method with following arguments: {}", arguments);
+ command.getMethod().invoke(runtime.getInstance(), arguments.toArray());
} catch (Exception exception) {
log.error("Command execution failed!", exception);
// this unwraps the underlying error in case of an exception inside the command class
@@ -125,7 +107,7 @@ public void onEvent(CommandContext context) {
}
@SuppressWarnings("ConstantConditions")
- private boolean checkCancelled(CommandContext context) {
+ private boolean checkCancelled(Context context) {
if (context.isCancelled()) {
ReplyContext replyContext = new ReplyContext(context);
replyContext.getBuilder().applyData(context.getErrorMessage());
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
index 7ac6a2db..0104ebed 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
@@ -1,72 +1,38 @@
package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
-import com.github.kaktushose.jda.commands.JDACommands;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.ModalReplyable;
import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
import org.jetbrains.annotations.NotNull;
/**
* This class is a subclass of {@link GenericEvent}.
- * It provides some additional features for sending messages and also grants
- * access to the {@link CommandDefinition} object which describes the command that is executed.
+ * It provides additional features for replying to a
+ * {@link net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent GenericCommandInteractionEvent}.
*
* @author Kaktushose
* @version 4.0.0
* @see GenericEvent
- * @see Replyable
- * @since 1.0.0
+ * @since 4.0.0
*/
-public class CommandEvent extends GenericEvent implements Replyable {
+public class CommandEvent extends GenericEvent implements ModalReplyable {
- private final CommandDefinition command;
- private final CommandContext context;
private final ReplyContext replyContext;
/**
- * Constructs a CommandEvent.
+ * Constructs a new CommandEvent.
*
- * @param command the underlying {@link CommandDefinition} object
- * @param context the {@link CommandContext}
+ * @param context the underlying {@link Context}
*/
- public CommandEvent(@NotNull CommandDefinition command, @NotNull CommandContext context) {
- super(GenericEvent.fromEvent(context.getEvent()));
- this.command = command;
- this.context = context;
+ public CommandEvent(@NotNull Context context) {
+ super(context);
replyContext = new ReplyContext(context);
}
- /**
- * Get the {@link CommandDefinition} object which describes the command that is executed.
- *
- * @return the underlying {@link CommandDefinition} object
- */
- public CommandDefinition getCommandDefinition() {
- return command;
- }
-
- /**
- * Get the {@link JDACommands} object.
- *
- * @return the {@link JDACommands} object
- */
- public JDACommands getJdaCommands() {
- return context.getJdaCommands();
- }
-
- /**
- * Get the {@link CommandContext} object.
- *
- * @return the registered {@link CommandContext} object
- */
- @Override
- public CommandContext getContext() {
- return context;
- }
-
@Override
- public ReplyContext getReplyContext() {
+ public @NotNull ReplyContext getReplyContext() {
return replyContext;
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandParser.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandParser.java
deleted file mode 100644
index 771f90c7..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandParser.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericParser;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * An implementation of {@link GenericParser} that can parse {@link SlashCommandInteractionEvent}.
- *
- * @author Kaktushose
- * @version 2.3.0
- * @since 2.3.0
- */
-public class CommandParser extends GenericParser {
-
- /**
- * Takes a {@link SlashCommandInteractionEvent}, parses and transpiles it into a {@link CommandContext}.
- *
- * @param event the {@link SlashCommandInteractionEvent} to parse
- * @param jdaCommands the {@link JDACommands} instance
- * @return a new {@link CommandContext}
- */
- @Override
- @NotNull
- public GenericContext parse(@NotNull SlashCommandInteractionEvent event, @NotNull JDACommands jdaCommands) {
- return new CommandContext(event, jdaCommands).setOptions(event.getOptions());
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
similarity index 72%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandContext.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
index 6f69ad16..c574a84c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
@@ -1,8 +1,8 @@
package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -14,17 +14,17 @@
import java.util.Map;
/**
- * Implementation of {@link GenericContext} for {@link SlashCommandInteractionEvent}.
+ * Implementation of {@link Context} for {@link SlashCommandInteractionEvent}.
*
* @author Kaktushose
* @version 4.0.0
* @since 4.0.0
*/
-public class CommandContext extends GenericContext {
+public class SlashCommandContext extends Context {
private String[] input;
private List options;
- private CommandDefinition command;
+ private SlashCommandDefinition command;
private List arguments;
/**
@@ -33,8 +33,14 @@ public class CommandContext extends GenericContext
* @param event the corresponding {@link GenericInteractionCreateEvent}
* @param jdaCommands the corresponding {@link JDACommands} instance
*/
- public CommandContext(SlashCommandInteractionEvent event, JDACommands jdaCommands) {
+ public SlashCommandContext(SlashCommandInteractionEvent event, JDACommands jdaCommands) {
super(event, jdaCommands);
+ setOptions(event.getOptions());
+ }
+
+ @Override
+ public SlashCommandInteractionEvent getEvent() {
+ return (SlashCommandInteractionEvent) super.getEvent();
}
/**
@@ -57,7 +63,7 @@ public String[] getInput() {
* @return the current CommandContext instance
*/
@NotNull
- public CommandContext setInput(@NotNull String[] input) {
+ public SlashCommandContext setInput(@NotNull String[] input) {
this.input = input;
return this;
}
@@ -93,31 +99,31 @@ public Map getOptionsAsMap() {
* @return the current CommandContext instance
*/
@NotNull
- public CommandContext setOptions(@NotNull List options) {
+ public SlashCommandContext setOptions(@NotNull List options) {
this.options = options;
return this;
}
/**
- * Gets the {@link CommandDefinition}. This will return null until the command got routed.
+ * Gets the {@link SlashCommandDefinition}. This will return null until the command got routed.
*
- * @return the {@link CommandDefinition}
+ * @return the {@link SlashCommandDefinition}
*/
@Nullable
- public CommandDefinition getCommand() {
+ public SlashCommandDefinition getCommand() {
return command;
}
/**
- * Set the {@link CommandDefinition}.
+ * Set the {@link SlashCommandDefinition}.
*
- * @param command the {@link CommandDefinition}
+ * @param command the {@link SlashCommandDefinition}
* @return the current CommandContext instance
*/
@NotNull
- public CommandContext setCommand(@Nullable CommandDefinition command) {
+ public SlashCommandContext setCommand(@Nullable SlashCommandDefinition command) {
this.command = command;
- setInteraction(command);
+ setInteractionDefinition(command);
return this;
}
@@ -138,7 +144,7 @@ public List getArguments() {
* @return the current CommandContext instance
*/
@NotNull
- public CommandContext setArguments(@NotNull List arguments) {
+ public SlashCommandContext setArguments(@NotNull List arguments) {
this.arguments = arguments;
return this;
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
new file mode 100644
index 00000000..f235fc74
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
@@ -0,0 +1,120 @@
+package com.github.kaktushose.jda.commands.dispatching.interactions.components;
+
+import com.github.kaktushose.jda.commands.JDACommands;
+import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
+import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.reflect.interactions.ButtonDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.menus.EntitySelectMenuDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.menus.StringSelectMenuDefinition;
+import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Dispatches component events.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @since 4.0.0
+ */
+public class ComponentDispatcher extends GenericDispatcher {
+
+ private static final Logger log = LoggerFactory.getLogger(ComponentDispatcher.class);
+
+ /**
+ * Constructs a new ComponentDispatcher.
+ *
+ * @param jdaCommands the corresponding {@link JDACommands} instance.
+ */
+ public ComponentDispatcher(JDACommands jdaCommands) {
+ super(jdaCommands);
+ }
+
+ @Override
+ public void onEvent(Context context) {
+ ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
+ GenericComponentInteractionCreateEvent event = (GenericComponentInteractionCreateEvent) context.getEvent();
+
+ Optional optionalRuntime = runtimeSupervisor.getRuntime(event);
+ if (optionalRuntime.isEmpty()) {
+ event.getHook().editOriginalComponents().queue();
+ event.getHook().sendMessage(messageFactory.getUnknownInteractionMessage(context)).setEphemeral(true).queue();
+ return;
+ }
+ RuntimeSupervisor.InteractionRuntime runtime = optionalRuntime.get();
+ log.debug("Found corresponding runtime with id \"{}\"", runtime.getInstanceId());
+
+ String[] splitId = event.getComponentId().split("\\.");
+ String componentId = String.format("%s.%s", splitId[0], splitId[1]);
+
+ List components = new ArrayList<>();
+ components.addAll(interactionRegistry.getButtons());
+ components.addAll(interactionRegistry.getSelectMenus());
+
+ Optional optionalComponent = components.stream().filter(it -> it.getId().equals(componentId)).findFirst();
+ if (optionalComponent.isEmpty()) {
+ IllegalStateException exception = new IllegalStateException(
+ "No select menu found! Please report this error the the devs of jda-commands."
+ );
+ context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, exception));
+ checkCancelled(context);
+ throw exception;
+ }
+
+ EphemeralInteractionDefinition component = optionalComponent.get();
+ context.setInteractionDefinition(component).setEphemeral(component.isEphemeral());
+ log.debug("Input matches component: {}", component.getId());
+
+ log.info("Executing select component {} for user {}", component.getMethod().getName(), event.getMember());
+ context.setRuntime(runtime);
+ try {
+ Class clazz = component.getClass();
+ if (EntitySelectMenuDefinition.class.isAssignableFrom(clazz)) {
+ component.getMethod().invoke(
+ runtime.getInstance(),
+ new ComponentEvent(context),
+ ((EntitySelectInteractionEvent) event).getMentions()
+ );
+ } else if (StringSelectMenuDefinition.class.isAssignableFrom(clazz)) {
+ component.getMethod().invoke(
+ runtime.getInstance(),
+ new ComponentEvent(context),
+ ((StringSelectInteractionEvent) event).getValues()
+ );
+ } else if (ButtonDefinition.class.isAssignableFrom(clazz)) {
+ component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context));
+ } else {
+ throw new IllegalStateException("Unknown component type! Please report this error the the devs of jda-commands.");
+ }
+ } catch (Exception exception) {
+ log.error("Select menu execution failed!", exception);
+ // this unwraps the underlying error in case of an exception inside the command class
+ Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
+
+ context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, throwable));
+ checkCancelled(context);
+ }
+ }
+
+ @SuppressWarnings("ConstantConditions")
+ private boolean checkCancelled(Context context) {
+ if (context.isCancelled()) {
+ ReplyContext replyContext = new ReplyContext(context);
+ replyContext.getBuilder().applyData(context.getErrorMessage());
+ replyContext.queue();
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
new file mode 100644
index 00000000..f678a93c
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
@@ -0,0 +1,54 @@
+package com.github.kaktushose.jda.commands.dispatching.interactions.components;
+
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.ModalReplyable;
+import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+/**
+ * This class is a subclass of {@link GenericEvent}.
+ * It provides additional features for replying to a
+ * {@link net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent GenericComponentInteractionCreateEvent}.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @see GenericEvent
+ * @since 4.0.0
+ */
+public class ComponentEvent extends GenericEvent implements ModalReplyable {
+
+ private final ReplyContext replyContext;
+
+ /**
+ * Constructs a ComponentEvent.
+ *
+ * @param context the underlying {@link Context}
+ */
+ public ComponentEvent(@NotNull Context context) {
+ super(context);
+ replyContext = new ReplyContext(context);
+ }
+
+ public ReplyContext getReplyContext() {
+ return replyContext;
+ }
+
+ @Override
+ public void reply() {
+ Optional optional = context.getRuntime().getLatestReply();
+ if (optional.isPresent()) {
+ MessageCreateData cached = optional.get();
+ if (replyContext.isKeepComponents() && replyContext.getBuilder().getComponents().isEmpty()) {
+ replyContext.getBuilder().setComponents(cached.getComponents());
+ }
+
+ }
+ replyContext.queue();
+ context.getRuntime().setLatestReply(replyContext.toMessageCreateData());
+ }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuContext.java
deleted file mode 100644
index 0bd02302..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuContext.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.menus;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.menus.EntitySelectMenuDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.menus.GenericSelectMenuDefinition;
-import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
-
-/**
- * Implementation of {@link GenericContext} for {@link GenericSelectMenuInteractionEvent}.
- *
- * @author Kaktushose
- * @version 4.0.0
- * @since 4.0.0
- */
-public class SelectMenuContext extends GenericContext> {
-
- private GenericSelectMenuDefinition selectMenu;
-
- /**
- * Constructs a new SelectMenuContext.
- *
- * @param event the corresponding {@link GenericSelectMenuInteractionEvent}
- * @param jdaCommands the corresponding {@link JDACommands} instance
- */
- public SelectMenuContext(GenericSelectMenuInteractionEvent event, JDACommands jdaCommands) {
- super(event, jdaCommands);
- }
-
- /**
- * Gets the {@link EntitySelectMenuDefinition}.
- *
- * @return the {@link EntitySelectMenuDefinition}
- */
- public GenericSelectMenuDefinition getSelectMenu() {
- return selectMenu;
- }
-
- /**
- * Set the {@link EntitySelectMenuDefinition}.
- *
- * @param selectMenu the {@link EntitySelectMenuDefinition}
- * @return the current CommandContext instance
- */
- public SelectMenuContext setSelectMenu(GenericSelectMenuDefinition selectMenu) {
- this.selectMenu = selectMenu;
- setInteraction(selectMenu);
- return this;
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuDispatcher.java
deleted file mode 100644
index 4df9976a..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuDispatcher.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.menus;
-
-import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.interactions.menus.EntitySelectMenuDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.menus.GenericSelectMenuDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.menus.StringSelectMenuDefinition;
-import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Optional;
-
-public class SelectMenuDispatcher extends GenericDispatcher {
-
- private static final Logger log = LoggerFactory.getLogger(SelectMenuDispatcher.class);
- private final RuntimeSupervisor runtimeSupervisor;
-
- /**
- * Constructs a new ButtonDispatcher.
- *
- * @param supervisor the {@link DispatcherSupervisor} which supervises this dispatcher.
- * @param runtimeSupervisor the corresponding {@link RuntimeSupervisor}
- */
- public SelectMenuDispatcher(DispatcherSupervisor supervisor, RuntimeSupervisor runtimeSupervisor) {
- super(supervisor);
- this.runtimeSupervisor = runtimeSupervisor;
- }
-
- /**
- * Dispatches a {@link SelectMenuContext}.
- *
- * @param context the {@link SelectMenuContext} to dispatch.
- */
- @Override
- public void onEvent(SelectMenuContext context) {
- log.debug("Acknowledging event");
- GenericSelectMenuInteractionEvent event = context.getEvent();
- event.deferEdit().queue();
-
- ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
-
- Optional optionalRuntime = runtimeSupervisor.getRuntime(event);
- if (optionalRuntime.isEmpty()) {
- event.getHook().editOriginalComponents().queue();
- event.getHook().sendMessage(messageFactory.getUnknownInteractionMessage(context)).setEphemeral(true).queue();
- return;
- }
- RuntimeSupervisor.InteractionRuntime runtime = optionalRuntime.get();
- log.debug("Found corresponding runtime with id \"{}\"", runtime);
-
- String[] splitId = event.getComponentId().split("\\.");
- String menuId = String.format("%s.%s", splitId[0], splitId[1]);
- Optional> optionalMenu = interactionRegistry.getSelectMenus().stream()
- .filter(it -> it.getId().equals(menuId))
- .findFirst();
- if (optionalMenu.isEmpty()) {
- IllegalStateException exception = new IllegalStateException(
- "No select menu found! Please report this error the the devs of jda-commands."
- );
- context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, exception));
- checkCancelled(context);
- throw exception;
- }
-
- GenericSelectMenuDefinition menu = optionalMenu.get();
- context.setSelectMenu(menu).setEphemeral(menu.isEphemeral());
- log.debug("Input matches select menu: {}", menu);
-
- log.info("Executing select menu {} for user {}", menu.getMethod().getName(), event.getMember());
- try {
- context.setRuntime(runtime);
-
- if (EntitySelectMenuDefinition.class.isAssignableFrom(menu.getClass())) {
- EntitySelectInteractionEvent entityEvent = (EntitySelectInteractionEvent) event;
- menu.getMethod().invoke(runtime.getInstance(), new SelectMenuEvent(menu, context), entityEvent.getMentions());
- } else if (StringSelectMenuDefinition.class.isAssignableFrom(menu.getClass())) {
- menu.getMethod().invoke(runtime.getInstance(), new SelectMenuEvent(menu, context), event.getValues());
- } else {
- throw new IllegalStateException("Unknown select menu type! Please report this error the the devs of jda-commands.");
- }
-
- } catch (Exception exception) {
- log.error("Select menu execution failed!", exception);
- // this unwraps the underlying error in case of an exception inside the command class
- Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
- context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, throwable));
- checkCancelled(context);
- }
- }
-
- @SuppressWarnings("ConstantConditions")
- private boolean checkCancelled(SelectMenuContext context) {
- if (context.isCancelled()) {
- ReplyContext replyContext = new ReplyContext(context);
- replyContext.getBuilder().applyData(context.getErrorMessage());
- replyContext.queue();
- return true;
- }
- return false;
- }
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuEvent.java
deleted file mode 100644
index 5785feb4..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuEvent.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.menus;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
-import com.github.kaktushose.jda.commands.dispatching.interactions.buttons.ButtonContext;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-import com.github.kaktushose.jda.commands.reflect.interactions.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.menus.EntitySelectMenuDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.menus.GenericSelectMenuDefinition;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Optional;
-
-/**
- * This class is a subclass of {@link GenericEvent}.
- * It provides additional features for sending messages or editing the original message and also grants
- * access to the {@link EntitySelectMenuDefinition} object which describes the select menu interaction that is executed.
- *
- * @author Kaktushose
- * @version 4.0.0
- * @see GenericEvent
- * @see Replyable
- * @since 4.0.0
- */
-public class SelectMenuEvent extends GenericEvent implements Replyable {
-
- private final GenericSelectMenuDefinition selectMenu;
- private final SelectMenuContext context;
- private final ReplyContext replyContext;
-
- /**
- * Constructs a ButtonEvent.
- *
- * @param selectMenu the underlying {@link ButtonDefinition} object
- * @param context the {@link ButtonContext}
- */
- public SelectMenuEvent(@NotNull GenericSelectMenuDefinition selectMenu, @NotNull SelectMenuContext context) {
- super(GenericEvent.fromEvent(context.getEvent()));
- this.selectMenu = selectMenu;
- this.context = context;
- replyContext = new ReplyContext(context);
- }
-
- /**
- * Get the {@link EntitySelectMenuDefinition} object which describes the button that is executed.
- *
- * @return the underlying {@link EntitySelectMenuDefinition} object
- */
- public GenericSelectMenuDefinition getSelectMenu() {
- return selectMenu;
- }
-
- /**
- * Get the {@link SelectMenuContext} object.
- *
- * @return the registered {@link SelectMenuContext} object
- */
- @Override
- public SelectMenuContext getContext() {
- return context;
- }
-
- /**
- * Get the {@link JDACommands} object.
- *
- * @return the {@link JDACommands} object
- */
- public JDACommands getJdaCommands() {
- return context.getJdaCommands();
- }
-
- public ReplyContext getReplyContext() {
- return replyContext;
- }
-
- @Override
- public void reply() {
- Optional optional = context.getRuntime().getLatestReply();
- if (optional.isPresent()) {
- MessageCreateData cached = optional.get();
- if (replyContext.isKeepComponents() && replyContext.getBuilder().getComponents().isEmpty()) {
- replyContext.getBuilder().setComponents(cached.getComponents());
- }
-
- }
- replyContext.queue();
- context.getRuntime().setLatestReply(replyContext.toMessageCreateData());
- }
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuParser.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuParser.java
deleted file mode 100644
index 196dd37c..00000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/menus/SelectMenuParser.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.menus;
-
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericParser;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * An implementation of {@link GenericParser} that can parse {@link ButtonInteractionEvent}.
- *
- * @author Kaktushose
- * @version 4.0.0
- * @since 4.0.0
- */
-public class SelectMenuParser extends GenericParser> {
-
- /**
- * Takes a {@link GenericSelectMenuInteractionEvent}, parses and transpiles it into a {@link SelectMenuContext}.
- *
- * @param event the {@link GenericSelectMenuInteractionEvent} to parse
- * @param jdaCommands the {@link JDACommands} instance
- * @return a new {@link SelectMenuContext}
- */
- @Override
- public @NotNull GenericContext parse(@NotNull GenericSelectMenuInteractionEvent event, @NotNull JDACommands jdaCommands) {
- return new SelectMenuContext(event, jdaCommands);
- }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
new file mode 100644
index 00000000..035752e4
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
@@ -0,0 +1,91 @@
+package com.github.kaktushose.jda.commands.dispatching.interactions.modals;
+
+import com.github.kaktushose.jda.commands.JDACommands;
+import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
+import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.interactions.modals.ModalMapping;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class ModalDispatcher extends GenericDispatcher {
+
+ private static final Logger log = LoggerFactory.getLogger(ModalDispatcher.class);
+
+ /**
+ * Constructs a new ButtonDispatcher.
+ *
+ * @param jdaCommands the corresponding {@link JDACommands} instance.
+ */
+ public ModalDispatcher(JDACommands jdaCommands) {
+ super(jdaCommands);
+ }
+
+ @Override
+ public void onEvent(Context context) {
+ ModalInteractionEvent event = (ModalInteractionEvent) context.getEvent();
+ ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
+
+ Optional optionalRuntime = runtimeSupervisor.getRuntime(event);
+ if (optionalRuntime.isEmpty()) {
+ event.getHook().sendMessage(messageFactory.getUnknownInteractionMessage(context)).setEphemeral(true).queue();
+ return;
+ }
+ RuntimeSupervisor.InteractionRuntime runtime = optionalRuntime.get();
+ log.debug("Found corresponding runtime with id \"{}\"", runtime.getInstanceId());
+
+ String[] splitId = event.getModalId().split("\\.");
+ String modalId = String.format("%s.%s", splitId[0], splitId[1]);
+ Optional optionalModal = interactionRegistry.getModals().stream()
+ .filter(it -> it.getId().equals(modalId))
+ .findFirst();
+
+ if (optionalModal.isEmpty()) {
+ IllegalStateException exception = new IllegalStateException(
+ "No Modal found! Please report this error the the devs of jda-commands."
+ );
+ context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, exception));
+ checkCancelled(context);
+ throw exception;
+ }
+
+ ModalDefinition modal = optionalModal.get();
+ context.setInteractionDefinition(modal).setEphemeral(modal.isEphemeral());
+ log.debug("Input matches Modal: {}", modal.getId());
+ log.info("Executing Modal {} for user {}", modal.getMethod().getName(), event.getMember());
+ try {
+ context.setRuntime(runtime);
+ List arguments = new ArrayList<>();
+ arguments.add(new ModalEvent(context));
+ arguments.addAll(event.getValues().stream().map(ModalMapping::getAsString).collect(Collectors.toSet()));
+ modal.getMethod().invoke(runtime.getInstance(), arguments.toArray());
+ } catch (Exception exception) {
+ log.error("Modal execution failed!", exception);
+ // this unwraps the underlying error in case of an exception inside the command class
+ Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
+ context.setCancelled(true).setErrorMessage(messageFactory.getCommandExecutionFailedMessage(context, throwable));
+ checkCancelled(context);
+ }
+ }
+
+ @SuppressWarnings("ConstantConditions")
+ private boolean checkCancelled(Context context) {
+ if (context.isCancelled()) {
+ ReplyContext replyContext = new ReplyContext(context);
+ replyContext.getBuilder().applyData(context.getErrorMessage());
+ replyContext.setEditReply(false).queue();
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
new file mode 100644
index 00000000..e6d53cf3
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
@@ -0,0 +1,38 @@
+package com.github.kaktushose.jda.commands.dispatching.interactions.modals;
+
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
+import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
+import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * This class is a subclass of {@link GenericEvent}.
+ * It provides additional features for replying to a
+ * {@link net.dv8tion.jda.api.events.interaction.ModalInteractionEvent ModalInteractionEvent}.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @see GenericEvent
+ * @since 4.0.0
+ */
+public class ModalEvent extends GenericEvent implements Replyable {
+
+ private final ReplyContext replyContext;
+
+ protected ModalEvent(Context context) {
+ super(context);
+ replyContext = new ReplyContext(context);
+ }
+
+ @Override
+ public @NotNull ReplyContext getReplyContext() {
+ return replyContext;
+ }
+
+ @Override
+ public void reply() {
+ replyContext.queue();
+ }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
new file mode 100644
index 00000000..df6a1582
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
@@ -0,0 +1,42 @@
+package com.github.kaktushose.jda.commands.dispatching.reply;
+
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.interactions.callbacks.IModalCallback;
+
+/**
+ * Generic interface holding reply methods for modal replies.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @since 4.0.0
+ */
+public interface ModalReplyable extends Replyable {
+
+ /**
+ * Replies to this Interaction with a Modal. This will open a popup on the target user's Discord client.
+ *
+ * @param modal the id of the modal to reply with
+ */
+ default void replyModal(String modal) {
+ IModalCallback callback;
+ Context context = getContext();
+ GenericInteractionCreateEvent event = context.getEvent();
+ if (event instanceof IModalCallback) {
+ callback = (IModalCallback) event;
+ } else {
+ throw new IllegalArgumentException(
+ String.format("Cannot reply to '%s'! Please report this error to the jda-commands devs!", event.getClass().getName())
+ );
+ }
+
+ String id = String.format("%s.%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), modal);
+
+ ModalDefinition modalDefinition = context.getJdaCommands().getInteractionRegistry().getModals().stream()
+ .filter(it -> it.getId().equals(id)).findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Modal"));
+
+ callback.replyModal(modalDefinition.toModal(modalDefinition.getRuntimeId(context))).queue();
+ }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java
index 5bbdb9bc..166e976b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.reply;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
@@ -36,9 +36,9 @@ public class ReplyContext {
/**
* Constructs a new ReplyContext.
*
- * @param context the corresponding {@link CommandContext}
+ * @param context the corresponding {@link SlashCommandContext}
*/
- public ReplyContext(GenericContext context) {
+ public ReplyContext(Context context) {
event = context.getEvent();
builder = new MessageCreateBuilder();
success = (message) -> {
@@ -210,10 +210,9 @@ public void queue() {
String.format("Cannot reply to '%s'! Please report this error to the jda-commands devs!", event.getClass().getName())
);
}
- // The ReplyContext is also used for error messages and some appear even before acknowledging took place
- // In this case the event gets acknowledged with ephemeral set to false
+
if (!event.isAcknowledged()) {
- callback.deferReply(false).queue();
+ callback.deferReply(ephemeralReply).queue();
}
callback.getHook().setEphemeral(ephemeralReply);
if (editReply) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
index 13c58fdc..073c9e1c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
@@ -2,14 +2,13 @@
import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
import com.github.kaktushose.jda.commands.data.EmbedDTO;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
import com.github.kaktushose.jda.commands.dispatching.reply.components.Buttons;
import com.github.kaktushose.jda.commands.dispatching.reply.components.Component;
import com.github.kaktushose.jda.commands.dispatching.reply.components.SelectMenus;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.interactions.components.ItemComponent;
import net.dv8tion.jda.api.interactions.components.buttons.Button;
@@ -157,12 +156,12 @@ default void reply(@NotNull EmbedDTO embedDTO, @Nullable Consumer succe
*/
default Replyable with(@NotNull Component... components) {
List items = new ArrayList<>();
- GenericContext context = getContext();
+ Context context = getContext();
for (Component component : components) {
if (component instanceof Buttons) {
Buttons buttons = (Buttons) component;
buttons.getButtons().forEach(button -> {
- String id = String.format("%s.%s", context.getInteraction().getMethod().getDeclaringClass().getSimpleName(), button.getId());
+ String id = String.format("%s.%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), button.getId());
context.getJdaCommands().getInteractionRegistry().getButtons()
.stream()
.filter(it -> it.getId().equals(id))
@@ -180,7 +179,7 @@ default Replyable with(@NotNull Component... components) {
if (component instanceof SelectMenus) {
SelectMenus menus = (SelectMenus) component;
menus.getSelectMenus().forEach(menu -> {
- String id = String.format("%s.%s", context.getInteraction().getMethod().getDeclaringClass().getSimpleName(), menu.getId());
+ String id = String.format("%s.%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), menu.getId());
context.getJdaCommands().getInteractionRegistry().getSelectMenus()
.stream()
.filter(it -> it.getId().equals(id))
@@ -196,7 +195,7 @@ default Replyable with(@NotNull Component... components) {
return this;
}
- GenericContext getContext();
+ Context getContext();
/**
* Adds an {@link ActionRow} to the reply and adds the passed {@link Component Components} to it.
@@ -245,7 +244,7 @@ default Replyable setEphemeral(boolean ephemeral) {
* @param success the callback consumer
* @return the current instance for fluent interface
*/
- private Replyable setSuccessCallback(Consumer success) {
+ default Replyable setSuccessCallback(Consumer success) {
getReplyContext().setSuccessCallback(success);
return this;
}
@@ -256,7 +255,7 @@ private Replyable setSuccessCallback(Consumer success) {
* @param failure the callback consumer
* @return the current instance for fluent interface
*/
- private Replyable setFailureCallback(Consumer failure) {
+ default Replyable setFailureCallback(Consumer failure) {
getReplyContext().setFailureCallback(failure);
return this;
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
index 4e8bde41..48b60c37 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
@@ -1,6 +1,6 @@
package com.github.kaktushose.jda.commands.dispatching.validation;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import org.jetbrains.annotations.NotNull;
/**
@@ -18,9 +18,9 @@ public interface Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument passes the constraints
*/
- boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context);
+ boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context);
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
index 427d22e0..f719acb3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.validation.impl;
import com.github.kaktushose.jda.commands.annotations.constraints.Max;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import org.jetbrains.annotations.NotNull;
@@ -20,11 +20,11 @@ public class MaximumValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument is a number whose value is lower or equal to the specified maximum
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
Max max = (Max) annotation;
return ((Number) argument).longValue() <= max.value();
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
index b8524b63..55ba17d9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.validation.impl;
import com.github.kaktushose.jda.commands.annotations.constraints.Min;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import org.jetbrains.annotations.NotNull;
@@ -21,11 +21,11 @@ public class MinimumValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument is a number whose value is greater or equal to the specified minimum
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
Min min = (Min) annotation;
return ((Number) argument).longValue() >= min.value();
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
index 3b30cddf..516cb845 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.validation.impl;
import com.github.kaktushose.jda.commands.annotations.constraints.NotPerm;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;
@@ -26,12 +26,12 @@ public class NotPermissionValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument is a user or member that doesn't have the specified discord
* permission
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
Set permissions = new HashSet<>();
NotPerm perm = (NotPerm) annotation;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
index 78bc945d..6ee5e13a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
@@ -2,7 +2,7 @@
import com.github.kaktushose.jda.commands.annotations.constraints.NotRole;
import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
@@ -25,11 +25,11 @@ public class NotRoleValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument is a user or member that doesn't have the specified guild role
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
NotRole roleAnnotation = (NotRole) annotation;
Optional optional = new RoleAdapter().parse(roleAnnotation.value(), context);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
index dcb81e0d..90ebc058 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
@@ -2,7 +2,7 @@
import com.github.kaktushose.jda.commands.annotations.constraints.NotUser;
import com.github.kaktushose.jda.commands.dispatching.adapter.impl.MemberAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import net.dv8tion.jda.api.entities.Member;
import org.jetbrains.annotations.NotNull;
@@ -24,11 +24,11 @@ public class NotUserValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument isn't the specified user or member
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
Member member = (Member) argument;
NotUser user = (NotUser) annotation;
Optional optional = new MemberAdapter().parse(user.value(), context);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
index 953cc6a9..6acf5a75 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.validation.impl;
import com.github.kaktushose.jda.commands.annotations.constraints.Perm;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;
@@ -26,12 +26,12 @@ public class PermissionValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument is a user or member that has the specified discord
* permission
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
Set permissions = new HashSet<>();
Perm perm = (Perm) annotation;
try {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
index 591fc1ee..61014024 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.dispatching.validation.impl;
import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
@@ -25,11 +25,11 @@ public class RoleValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument is a user or member that has the specified guild role
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
com.github.kaktushose.jda.commands.annotations.constraints.Role roleAnnotation =
(com.github.kaktushose.jda.commands.annotations.constraints.Role) annotation;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
index 4b002af8..e7369b74 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
@@ -2,7 +2,7 @@
import com.github.kaktushose.jda.commands.annotations.constraints.User;
import com.github.kaktushose.jda.commands.dispatching.adapter.impl.MemberAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
import net.dv8tion.jda.api.entities.Member;
import org.jetbrains.annotations.NotNull;
@@ -24,11 +24,11 @@ public class UserValidator implements Validator {
*
* @param argument the argument to validate
* @param annotation the corresponding annotation
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the argument is the specified user or member
*/
@Override
- public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull GenericContext context) {
+ public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
Member member = (Member) argument;
User user = (User) annotation;
Optional optional = new MemberAdapter().parse(user.value(), context);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
index 09e9a618..588d612e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
@@ -1,10 +1,10 @@
package com.github.kaktushose.jda.commands.embeds;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
@@ -31,9 +31,9 @@ public class DefaultErrorMessageFactory implements ErrorMessageFactory {
protected static final String PREFIX = Matcher.quoteReplacement("/");
@Override
- public MessageCreateData getTypeAdaptingFailedMessage(@NotNull CommandContext context) {
+ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandContext context) {
StringBuilder sbExpected = new StringBuilder();
- CommandDefinition command = context.getCommand();
+ SlashCommandDefinition command = context.getCommand();
List arguments = Arrays.asList(context.getInput());
command.getParameters().forEach(parameter -> {
@@ -64,9 +64,9 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull CommandContext co
}
@Override
- public MessageCreateData getInsufficientPermissionsMessage(@NotNull CommandContext context) {
+ public MessageCreateData getInsufficientPermissionsMessage(@NotNull SlashCommandContext context) {
StringBuilder sbPermissions = new StringBuilder();
- CommandDefinition command = context.getCommand();
+ SlashCommandDefinition command = context.getCommand();
command.getPermissions().forEach(permission -> sbPermissions.append(permission).append(", "));
String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
MessageEmbed embed = new EmbedBuilder()
@@ -82,7 +82,7 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull CommandConte
}
@Override
- public MessageCreateData getGuildMutedMessage(@NotNull GenericContext context) {
+ public MessageCreateData getGuildMutedMessage(@NotNull Context context) {
return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
.setColor(Color.RED)
.setTitle("Insufficient Permissions")
@@ -92,7 +92,7 @@ public MessageCreateData getGuildMutedMessage(@NotNull GenericContext context
}
@Override
- public MessageCreateData getChannelMutedMessage(@NotNull GenericContext context) {
+ public MessageCreateData getChannelMutedMessage(@NotNull Context context) {
return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
.setColor(Color.RED)
.setTitle("Insufficient Permissions")
@@ -102,7 +102,7 @@ public MessageCreateData getChannelMutedMessage(@NotNull GenericContext conte
}
@Override
- public MessageCreateData getUserMutedMessage(@NotNull GenericContext context) {
+ public MessageCreateData getUserMutedMessage(@NotNull Context context) {
return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
.setColor(Color.RED)
.setTitle("Insufficient Permissions")
@@ -112,7 +112,7 @@ public MessageCreateData getUserMutedMessage(@NotNull GenericContext context)
}
@Override
- public MessageCreateData getConstraintFailedMessage(@NotNull GenericContext context, @NotNull ConstraintDefinition constraint) {
+ public MessageCreateData getConstraintFailedMessage(@NotNull Context context, @NotNull ConstraintDefinition constraint) {
return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
.setColor(Color.ORANGE)
.setTitle("Parameter Error")
@@ -122,7 +122,7 @@ public MessageCreateData getConstraintFailedMessage(@NotNull GenericContext c
}
@Override
- public MessageCreateData getCooldownMessage(@NotNull GenericContext context, long ms) {
+ public MessageCreateData getCooldownMessage(@NotNull Context context, long ms) {
long secs = TimeUnit.MILLISECONDS.toSeconds(ms);
long seconds = secs % 60;
long minutes = (secs / 60) % 60;
@@ -153,7 +153,7 @@ public MessageCreateData getCooldownMessage(@NotNull GenericContext context,
}
@Override
- public MessageCreateData getWrongChannelTypeMessage(@NotNull GenericContext context) {
+ public MessageCreateData getWrongChannelTypeMessage(@NotNull Context context) {
return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
.setColor(Color.RED)
.setTitle("Wrong Channel Type")
@@ -163,7 +163,7 @@ public MessageCreateData getWrongChannelTypeMessage(@NotNull GenericContext c
}
@Override
- public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericContext context, @NotNull Throwable exception) {
+ public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context context, @NotNull Throwable exception) {
String error;
error = String.format("```The user \"%s\" attempted to execute an \"%s\" interaction at %s, " +
@@ -185,7 +185,7 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericContex
}
@Override
- public MessageCreateData getUnknownInteractionMessage(@NotNull GenericContext context) {
+ public MessageCreateData getUnknownInteractionMessage(@NotNull Context context) {
return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
.setColor(Color.RED)
.setTitle("Unknown Interaction")
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java
index 5bd556c4..94612677 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.embeds;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
@@ -20,83 +20,83 @@ public interface ErrorMessageFactory {
/**
* Gets a {@link MessageCreateData} to send when type adapting of the user input failed.
*
- * @param context the corresponding {@link CommandContext}
+ * @param context the corresponding {@link SlashCommandContext}
* @return a {@link MessageCreateData} to send when type adapting failed
*/
- MessageCreateData getTypeAdaptingFailedMessage(@NotNull CommandContext context);
+ MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandContext context);
/**
* Gets a {@link MessageCreateData} to send when a user is missing permissions.
*
- * @param context the corresponding {@link CommandContext}
+ * @param context the corresponding {@link SlashCommandContext}
* @return a {@link MessageCreateData} to send when a user is missing permissions
*/
- MessageCreateData getInsufficientPermissionsMessage(@NotNull CommandContext context);
+ MessageCreateData getInsufficientPermissionsMessage(@NotNull SlashCommandContext context);
/**
* Gets a {@link MessageCreateData} to send when a {@link net.dv8tion.jda.api.entities.Guild Guild} is muted.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return a {@link MessageCreateData} to send when a {@link net.dv8tion.jda.api.entities.Guild Guild} is muted
*/
- MessageCreateData getGuildMutedMessage(@NotNull GenericContext context);
+ MessageCreateData getGuildMutedMessage(@NotNull Context context);
/**
* Gets a {@link MessageCreateData} to send when a {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel} is muted.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return a {@link MessageCreateData} to send when a {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel} is muted
*/
- MessageCreateData getChannelMutedMessage(@NotNull GenericContext context);
+ MessageCreateData getChannelMutedMessage(@NotNull Context context);
/**
* Gets a {@link MessageCreateData} to send when a {@link net.dv8tion.jda.api.entities.User User} is muted.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return a {@link MessageCreateData} to send when a {@link net.dv8tion.jda.api.entities.User User} is muted
*/
- MessageCreateData getUserMutedMessage(@NotNull GenericContext context);
+ MessageCreateData getUserMutedMessage(@NotNull Context context);
/**
* Gets a {@link MessageCreateData} to send when a parameter constraint fails.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @param constraint the corresponding {@link ConstraintDefinition} that failed
* @return a {@link MessageCreateData} to send when a parameter constraint fails
*/
- MessageCreateData getConstraintFailedMessage(@NotNull GenericContext context, @NotNull ConstraintDefinition constraint);
+ MessageCreateData getConstraintFailedMessage(@NotNull Context context, @NotNull ConstraintDefinition constraint);
/**
* Gets a {@link Message} to send when a command still has a cooldown.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return a {@link MessageCreateData} to send when a command still has a cooldown
*/
- MessageCreateData getCooldownMessage(@NotNull GenericContext context, long ms);
+ MessageCreateData getCooldownMessage(@NotNull Context context, long ms);
/**
* Gets a {@link MessageCreateData} to send when the channel type isn't suitable for the command.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return a {@link MessageCreateData} to send when the channel type isn't suitable for the command
*/
- MessageCreateData getWrongChannelTypeMessage(@NotNull GenericContext context);
+ MessageCreateData getWrongChannelTypeMessage(@NotNull Context context);
/**
* Gets a {@link MessageCreateData} to send when the command execution failed.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @param exception the Exception that made the command execution fail
* @return a {@link MessageCreateData} to send when the command execution failed
*/
- MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericContext context, @NotNull Throwable exception);
+ MessageCreateData getCommandExecutionFailedMessage(@NotNull Context context, @NotNull Throwable exception);
/**
* Gets a {@link MessageCreateData} to send when an incoming interaction already timed out.
*
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return a {@link MessageCreateData} to send when an incoming interaction already timed out
*/
- MessageCreateData getUnknownInteractionMessage(@NotNull GenericContext context);
+ MessageCreateData getUnknownInteractionMessage(@NotNull Context context);
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
index 07b5de8f..c9123dba 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
@@ -1,11 +1,11 @@
package com.github.kaktushose.jda.commands.embeds;
import com.github.kaktushose.jda.commands.data.EmbedCache;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
import org.jetbrains.annotations.NotNull;
@@ -31,13 +31,13 @@ public JsonErrorMessageFactory(EmbedCache embedCache) {
}
@Override
- public MessageCreateData getTypeAdaptingFailedMessage(@NotNull CommandContext context) {
+ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandContext context) {
if (!embedCache.containsEmbed("typeAdaptingFailed")) {
return super.getTypeAdaptingFailedMessage(context);
}
StringBuilder sbExpected = new StringBuilder();
- CommandDefinition command = context.getCommand();
+ SlashCommandDefinition command = context.getCommand();
List arguments = Arrays.asList(context.getInput());
command.getParameters().forEach(parameter -> {
@@ -64,12 +64,12 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull CommandContext co
}
@Override
- public MessageCreateData getInsufficientPermissionsMessage(@NotNull CommandContext context) {
+ public MessageCreateData getInsufficientPermissionsMessage(@NotNull SlashCommandContext context) {
if (!embedCache.containsEmbed("insufficientPermissions")) {
return super.getInsufficientPermissionsMessage(context);
}
- CommandDefinition command = context.getCommand();
+ SlashCommandDefinition command = context.getCommand();
StringBuilder sbPermissions = new StringBuilder();
command.getPermissions().forEach(permission -> sbPermissions.append(permission).append(", "));
String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
@@ -82,7 +82,7 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull CommandConte
}
@Override
- public MessageCreateData getGuildMutedMessage(@NotNull GenericContext context) {
+ public MessageCreateData getGuildMutedMessage(@NotNull Context context) {
if (!embedCache.containsEmbed("guildMuted")) {
return super.getGuildMutedMessage(context);
}
@@ -90,7 +90,7 @@ public MessageCreateData getGuildMutedMessage(@NotNull GenericContext context
}
@Override
- public MessageCreateData getChannelMutedMessage(@NotNull GenericContext context) {
+ public MessageCreateData getChannelMutedMessage(@NotNull Context context) {
if (!embedCache.containsEmbed("channelMuted")) {
return super.getChannelMutedMessage(context);
}
@@ -98,7 +98,7 @@ public MessageCreateData getChannelMutedMessage(@NotNull GenericContext conte
}
@Override
- public MessageCreateData getUserMutedMessage(@NotNull GenericContext context) {
+ public MessageCreateData getUserMutedMessage(@NotNull Context context) {
if (!embedCache.containsEmbed("userMuted")) {
return super.getUserMutedMessage(context);
}
@@ -106,7 +106,7 @@ public MessageCreateData getUserMutedMessage(@NotNull GenericContext context)
}
@Override
- public MessageCreateData getConstraintFailedMessage(@NotNull GenericContext context, @NotNull ConstraintDefinition constraint) {
+ public MessageCreateData getConstraintFailedMessage(@NotNull Context context, @NotNull ConstraintDefinition constraint) {
if (!embedCache.containsEmbed("constraintFailed")) {
return super.getConstraintFailedMessage(context, constraint);
}
@@ -116,7 +116,7 @@ public MessageCreateData getConstraintFailedMessage(@NotNull GenericContext c
}
@Override
- public MessageCreateData getCooldownMessage(@NotNull GenericContext context, long ms) {
+ public MessageCreateData getCooldownMessage(@NotNull Context context, long ms) {
if (!embedCache.containsEmbed("cooldown")) {
return super.getCooldownMessage(context, ms);
}
@@ -132,7 +132,7 @@ public MessageCreateData getCooldownMessage(@NotNull GenericContext context,
}
@Override
- public MessageCreateData getWrongChannelTypeMessage(@NotNull GenericContext context) {
+ public MessageCreateData getWrongChannelTypeMessage(@NotNull Context context) {
if (!embedCache.containsEmbed("wrongChannel")) {
return super.getWrongChannelTypeMessage(context);
}
@@ -140,7 +140,7 @@ public MessageCreateData getWrongChannelTypeMessage(@NotNull GenericContext c
}
@Override
- public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericContext context, @NotNull Throwable exception) {
+ public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context context, @NotNull Throwable exception) {
if (!embedCache.containsEmbed("executionFailed")) {
return super.getCommandExecutionFailedMessage(context, exception);
}
@@ -150,7 +150,7 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericContex
}
@Override
- public MessageCreateData getUnknownInteractionMessage(@NotNull GenericContext context) {
+ public MessageCreateData getUnknownInteractionMessage(@NotNull Context context) {
if (!embedCache.containsEmbed("unknownInteraction")) {
return super.getUnknownInteractionMessage(context);
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
index cdb46ddb..1aad2d34 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.permissions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
@@ -14,10 +14,10 @@
/**
* Default implementation of {@link PermissionsProvider} with the following behaviour:
*
- * {@link PermissionsProvider#isMuted(User, GenericContext)} will always return {@code false}
- * {@link PermissionsProvider#hasPermission(User, GenericContext)} will always return {@code true}
+ * {@link PermissionsProvider#isMuted(User, Context)} will always return {@code false}
+ * {@link PermissionsProvider#hasPermission(User, Context)} will always return {@code true}
*
- * {@link PermissionsProvider#hasPermission(Member, GenericContext)} will check against the default Discord permissions. More
+ * {@link PermissionsProvider#hasPermission(Member, Context)} will check against the default Discord permissions. More
* formally, this method will work with any permission provided by {@link Permission#values()}, ignoring the
* case. Any other permission String will be ignored.
*
@@ -33,19 +33,19 @@ public class DefaultPermissionsProvider implements PermissionsProvider {
private static final Logger log = LoggerFactory.getLogger(DefaultPermissionsProvider.class);
@Override
- public boolean isMuted(@NotNull User user, @NotNull GenericContext context) {
+ public boolean isMuted(@NotNull User user, @NotNull Context context) {
return false;
}
@Override
- public boolean hasPermission(@NotNull User user, @NotNull GenericContext context) {
+ public boolean hasPermission(@NotNull User user, @NotNull Context context) {
return true;
}
@Override
- public boolean hasPermission(@NotNull Member member, @NotNull GenericContext ctx) {
+ public boolean hasPermission(@NotNull Member member, @NotNull Context ctx) {
// TODO temporary fix until permissions for other events were figured out
- CommandContext context = (CommandContext) ctx;
+ SlashCommandContext context = (SlashCommandContext) ctx;
for (String s : context.getCommand().getPermissions()) {
// not a discord perm, continue
if (Arrays.stream(Permission.values()).noneMatch(p -> p.name().equalsIgnoreCase(s))) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
index 60efca03..77859bb7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
@@ -1,7 +1,7 @@
package com.github.kaktushose.jda.commands.permissions;
import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
@@ -22,35 +22,35 @@
public interface PermissionsProvider {
/**
- * Checks if a {@link User} is muted. Useful for ban lists, where the {@link GenericContext} should be cancelled even before
+ * Checks if a {@link User} is muted. Useful for ban lists, where the {@link Context} should be cancelled even before
* routing, permission checks, etc.
*
* @param user the {@link User} to perform the check against
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the user is muted
* @see com.github.kaktushose.jda.commands.dispatching.filter.impl.UserMuteFilter UserMuteFilter
*/
- boolean isMuted(@NotNull User user, @NotNull GenericContext context);
+ boolean isMuted(@NotNull User user, @NotNull Context context);
/**
- * Checks if a {@link User} has permissions. Compared to {@link #hasPermission(Member, GenericContext)} this method will be
+ * Checks if a {@link User} has permissions. Compared to {@link #hasPermission(Member, Context)} this method will be
* called if the command gets executed in a non-guild context, where no member object is available.
*
* @param user the {@link User} to perform the check against
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the user has the permission to execute the command
- * @see #hasPermission(Member, GenericContext)
+ * @see #hasPermission(Member, Context)
*/
- boolean hasPermission(@NotNull User user, @NotNull GenericContext context);
+ boolean hasPermission(@NotNull User user, @NotNull Context context);
/**
* Checks if a {@link Member} has permissions.
*
* @param member the {@link Member} to perform the check against
- * @param context the corresponding {@link GenericContext}
+ * @param context the corresponding {@link Context}
* @return {@code true} if the user has the permission to execute the command
*/
- boolean hasPermission(@NotNull Member member, @NotNull GenericContext context);
+ boolean hasPermission(@NotNull Member member, @NotNull Context context);
/**
* Gets a {@link List} of user ids that map to the given permission string.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/ControllerDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
similarity index 52%
rename from src/main/java/com/github/kaktushose/jda/commands/reflect/ControllerDefinition.java
rename to src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
index 502e98f1..9a7b0f0d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/ControllerDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
@@ -6,10 +6,14 @@
import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
import com.github.kaktushose.jda.commands.reflect.interactions.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import com.github.kaktushose.jda.commands.reflect.interactions.menus.EntitySelectMenuDefinition;
import com.github.kaktushose.jda.commands.reflect.interactions.menus.GenericSelectMenuDefinition;
import com.github.kaktushose.jda.commands.reflect.interactions.menus.StringSelectMenuDefinition;
+import net.dv8tion.jda.api.interactions.commands.Command;
import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
import org.jetbrains.annotations.NotNull;
@@ -23,99 +27,113 @@
import java.util.stream.Collectors;
/**
- * Representation of a interaction controller.
+ * Representation of an interaction controller.
*
* @author Kaktushose
* @version 4.0.0
* @since 2.0.0
*/
-public class ControllerDefinition {
+public class InteractionControllerDefinition {
- private static final Logger log = LoggerFactory.getLogger(ControllerDefinition.class);
- private final List commands;
+ private static final Logger log = LoggerFactory.getLogger(InteractionControllerDefinition.class);
+ private final List commands;
private final List buttons;
private final List> selectMenus;
private final List autoCompletes;
+ private final List modals;
- private ControllerDefinition(List commands,
- List buttons,
- List> selectMenus,
- List autoCompletes) {
+ private InteractionControllerDefinition(List commands,
+ List buttons,
+ List> selectMenus,
+ List autoCompletes,
+ List modals) {
this.commands = commands;
this.buttons = buttons;
this.selectMenus = selectMenus;
this.autoCompletes = autoCompletes;
+ this.modals = modals;
}
/**
* Builds a new ControllerDefinition.
*
- * @param controllerClass the {@link Class} of the controller
+ * @param interactionClass the {@link Class} of the controller
* @param validatorRegistry the corresponding {@link ValidatorRegistry}
* @param dependencyInjector the corresponding {@link DependencyInjector}
* @param localizationFunction the {@link LocalizationFunction} to use
* @return an {@link Optional} holding the ControllerDefinition
*/
- public static Optional build(@NotNull Class controllerClass,
- @NotNull ValidatorRegistry validatorRegistry,
- @NotNull DependencyInjector dependencyInjector,
- @NotNull LocalizationFunction localizationFunction) {
- Interaction interaction = controllerClass.getAnnotation(Interaction.class);
+ public static Optional build(@NotNull Class interactionClass,
+ @NotNull ValidatorRegistry validatorRegistry,
+ @NotNull DependencyInjector dependencyInjector,
+ @NotNull LocalizationFunction localizationFunction) {
+ Interaction interaction = interactionClass.getAnnotation(Interaction.class);
if (!interaction.isActive()) {
- log.warn("Interaction class {} is set inactive. Skipping the controller and its commands", controllerClass.getName());
+ log.warn("Interaction class {} is set inactive. Skipping the controller and its commands", interactionClass.getName());
return Optional.empty();
}
List fields = new ArrayList<>();
- for (Field field : controllerClass.getDeclaredFields()) {
+ for (Field field : interactionClass.getDeclaredFields()) {
if (!field.isAnnotationPresent(Inject.class)) {
continue;
}
fields.add(field);
}
- dependencyInjector.registerDependencies(controllerClass, fields);
+ dependencyInjector.registerDependencies(interactionClass, fields);
Set permissions = new HashSet<>();
// index controller level permissions
- if (controllerClass.isAnnotationPresent(Permissions.class)) {
- Permissions permission = controllerClass.getAnnotation(Permissions.class);
+ if (interactionClass.isAnnotationPresent(Permissions.class)) {
+ Permissions permission = interactionClass.getAnnotation(Permissions.class);
permissions = Arrays.stream(permission.value()).collect(Collectors.toSet());
}
// get controller level cooldown and use it if no command level cooldown is present
CooldownDefinition cooldown = null;
- if (controllerClass.isAnnotationPresent(Cooldown.class)) {
- cooldown = CooldownDefinition.build(controllerClass.getAnnotation(Cooldown.class));
+ if (interactionClass.isAnnotationPresent(Cooldown.class)) {
+ cooldown = CooldownDefinition.build(interactionClass.getAnnotation(Cooldown.class));
}
// index interactions
- List commands = new ArrayList<>();
+ List commands = new ArrayList<>();
List buttons = new ArrayList<>();
List> selectMenus = new ArrayList<>();
List autoCompletes = new ArrayList<>();
- for (Method method : controllerClass.getDeclaredMethods()) {
+ List modals = new ArrayList<>();
+ for (Method method : interactionClass.getDeclaredMethods()) {
+ // index commands
if (method.isAnnotationPresent(SlashCommand.class)) {
- Optional optional = CommandDefinition.build(method, validatorRegistry, localizationFunction);
+ Optional optional = SlashCommandDefinition.build(method, validatorRegistry, localizationFunction);
if (optional.isEmpty()) {
continue;
}
- CommandDefinition commandDefinition = optional.get();
-
- // add controller level permissions
+ SlashCommandDefinition commandDefinition = optional.get();
commandDefinition.getPermissions().addAll(permissions);
if (commandDefinition.getCooldown().getDelay() == 0) {
commandDefinition.getCooldown().set(cooldown);
}
-
if (interaction.ephemeral()) {
commandDefinition.setEphemeral(true);
}
-
+ commands.add(commandDefinition);
+ }
+ if (method.isAnnotationPresent(ContextCommand.class)) {
+ Optional optional = ContextCommandDefinition.build(method, localizationFunction);
+ if (optional.isEmpty()) {
+ continue;
+ }
+ ContextCommandDefinition commandDefinition = optional.get();
+ commandDefinition.getPermissions().addAll(permissions);
+ if (interaction.ephemeral()) {
+ commandDefinition.setEphemeral(true);
+ }
commands.add(commandDefinition);
}
+ // index components
if (method.isAnnotationPresent(Button.class)) {
ButtonDefinition.build(method).ifPresent(button -> {
if (interaction.ephemeral()) {
@@ -124,7 +142,6 @@ public static Optional build(@NotNull Class controllerC
buttons.add(button);
});
}
-
if (method.isAnnotationPresent(EntitySelectMenu.class)) {
EntitySelectMenuDefinition.build(method).ifPresent(menu -> {
if (interaction.ephemeral()) {
@@ -142,6 +159,19 @@ public static Optional build(@NotNull Class controllerC
});
}
+ //index modals
+ if (method.isAnnotationPresent(Modal.class)) {
+ ModalDefinition.build(method).ifPresent(modal -> {
+ if (interaction.ephemeral()) {
+ modal.setEphemeral(true);
+ }
+ modals.add(modal);
+ });
+ }
+ }
+
+ //loop again and index auto complete
+ for (Method method : interactionClass.getDeclaredMethods()) {
if (method.isAnnotationPresent(AutoComplete.class)) {
AutoCompleteDefinition.build(
method,
@@ -149,23 +179,29 @@ public static Optional build(@NotNull Class controllerC
).ifPresent(autoComplete -> {
autoCompletes.add(autoComplete);
- autoComplete.getCommandNames().forEach(name ->
- commands.stream().filter(it -> it.getName().equals(name))
- .findFirst().ifPresent(it -> it.setAutoComplete(true))
+ Set commandNames = new HashSet<>();
+ autoComplete.getCommandNames().forEach(name -> commands.stream()
+ .filter(it -> it.getCommandType() == Command.Type.SLASH)
+ .filter(command -> command.getName().startsWith(name))
+ .forEach(command -> {
+ ((SlashCommandDefinition) command).setAutoComplete(true);
+ commandNames.add(command.getName());
+ })
);
+ autoComplete.setCommandNames(commandNames);
});
}
}
- return Optional.of(new ControllerDefinition(commands, buttons, selectMenus, autoCompletes));
+ return Optional.of(new InteractionControllerDefinition(commands, buttons, selectMenus, autoCompletes, modals));
}
/**
- * Gets a possibly-empty list of all commands.
+ * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}.
*
- * @return a possibly-empty list of all commands
+ * @return a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}
*/
- public List getCommands() {
+ public List getCommands() {
return commands;
}
@@ -187,10 +223,24 @@ public List> getSelectMenus()
return selectMenus;
}
+ /**
+ * Gets a possibly-empty list of all {@link AutoCompleteDefinition AutoCompleteDefinitions}.
+ *
+ * @return a possibly-empty list of all {@link AutoCompleteDefinition AutoCompleteDefinitions}
+ */
public Collection getAutoCompletes() {
return autoCompletes;
}
+ /**
+ * Gets a possibly-empty list of all {@link ModalDefinition ModalDefinitions}.
+ *
+ * @return a possibly-empty list of all {@link ModalDefinition ModalDefinitions}
+ */
+ public List getModals() {
+ return modals;
+ }
+
@Override
public String toString() {
return "ControllerDefinition{" +
@@ -198,8 +248,8 @@ public String toString() {
", buttons=" + buttons +
", selectMenus=" + selectMenus +
", autoCompletes=" + autoCompletes +
+ ", modals=" + modals +
'}';
}
-
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
index de8ff8ee..786fd12f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
@@ -5,8 +5,12 @@
import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
import com.github.kaktushose.jda.commands.reflect.interactions.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.CommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
import com.github.kaktushose.jda.commands.reflect.interactions.menus.GenericSelectMenuDefinition;
+import net.dv8tion.jda.api.interactions.commands.Command;
import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
import org.jetbrains.annotations.NotNull;
@@ -22,9 +26,10 @@
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
/**
- * Central registry for all {@link CommandDefinition CommandDefinitions}.
+ * Central registry for all {@link SlashCommandDefinition CommandDefinitions}.
*
* @author Kaktushose
* @version 2.0.0
@@ -36,11 +41,12 @@ public class InteractionRegistry {
private final ValidatorRegistry validatorRegistry;
private final DependencyInjector dependencyInjector;
private final LocalizationFunction localizationFunction;
- private final Set controllers;
- private final Set commands;
+ private final Set controllers;
+ private final Set commands;
private final Set buttons;
private final Set> selectMenus;
private final Set autoCompletes;
+ private final Set modals;
/**
* Constructs a new CommandRegistry.
@@ -60,6 +66,7 @@ public InteractionRegistry(@NotNull ValidatorRegistry validatorRegistry,
buttons = new HashSet<>();
selectMenus = new HashSet<>();
autoCompletes = new HashSet<>();
+ modals = new HashSet<>();
}
/**
@@ -85,9 +92,9 @@ public void index(@NotNull Class clazz, @NotNull String... packages) {
Set> controllerSet = reflections.getTypesAnnotatedWith(Interaction.class);
for (Class aClass : controllerSet) {
- log.debug("Found controller {}", aClass.getName());
+ log.debug("Found interaction controller {}", aClass.getName());
- Optional optional = ControllerDefinition.build(
+ Optional optional = InteractionControllerDefinition.build(
aClass,
validatorRegistry,
dependencyInjector,
@@ -95,43 +102,66 @@ public void index(@NotNull Class clazz, @NotNull String... packages) {
);
if (optional.isEmpty()) {
- log.warn("Unable to index the controller!");
+ log.warn("Unable to index the interaction controller!");
continue;
}
- ControllerDefinition controller = optional.get();
+ InteractionControllerDefinition controller = optional.get();
controllers.add(controller);
commands.addAll(controller.getCommands());
buttons.addAll(controller.getButtons());
selectMenus.addAll(controller.getSelectMenus());
autoCompletes.addAll(controller.getAutoCompletes());
-
- log.debug("Registered controller {}", controller);
+ modals.addAll(controller.getModals());
+ log.debug("Registered interaction controller {}", controller);
}
- log.debug("Successfully registered {} controller(s) with a total of {} interaction(s)!",
+ log.debug("Successfully registered {} interaction controller(s) with a total of {} interaction(s)!",
controllers.size(),
commands.size() + buttons.size());
}
/**
- * Gets a possibly-empty list of all {@link ControllerDefinition ControllerDefinitions}.
+ * Gets a possibly-empty list of all {@link InteractionControllerDefinition ControllerDefinitions}.
*
- * @return a possibly-empty list of all {@link ControllerDefinition ControllerDefinitions}
+ * @return a possibly-empty list of all {@link InteractionControllerDefinition ControllerDefinitions}
*/
- public Set getControllers() {
+ public Set getInteractionControllers() {
return Collections.unmodifiableSet(controllers);
}
/**
- * Gets a possibly-empty list of all {@link CommandDefinition CommandDefinitions}.
+ * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}.
*
- * @return a possibly-empty list of all {@link CommandDefinition CommandDefinitions}
+ * @return a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}
*/
- public Set getCommands() {
+ public Set getCommands() {
return Collections.unmodifiableSet(commands);
}
+ /**
+ * Gets a possibly-empty list of all {@link SlashCommandDefinition CommandDefinitions}.
+ *
+ * @return a possibly-empty list of all {@link SlashCommandDefinition CommandDefinitions}
+ */
+ public Set getSlashCommands() {
+ return commands.stream().filter(it -> (it.getCommandType() == Command.Type.SLASH))
+ .map(it -> (SlashCommandDefinition) it)
+ .collect(Collectors.toUnmodifiableSet());
+ }
+
+ /**
+ * Gets a possibly-empty list of all {@link ContextCommandDefinition CommandDefinitions}.
+ *
+ * @return a possibly-empty list of all {@link ContextCommandDefinition CommandDefinitions}
+ */
+ public Set getContextCommands() {
+ return commands.stream().filter(it ->
+ (it.getCommandType() == Command.Type.USER) || it.getCommandType() == Command.Type.MESSAGE)
+ .map(it -> (ContextCommandDefinition) it)
+ .collect(Collectors.toUnmodifiableSet());
+ }
+
/**
* Gets a possibly-empty list of all {@link ButtonDefinition ButtonDefinitions}.
*
@@ -151,12 +181,15 @@ public Set getAutoCompletes() {
}
/**
- * Gets a possibly-empty list of all {@link ButtonDefinition ButtonDefinitions}.
+ * Gets a possibly-empty list of all {@link ModalDefinition ModalDefinitions}.
*
- * @return a possibly-empty list of all {@link ButtonDefinition ButtonDefinitions}
+ * @return a possibly-empty list of all {@link ModalDefinition ModalDefinitions}
*/
public Set> getSelectMenus() {
return Collections.unmodifiableSet(selectMenus);
}
+ public Set getModals() {
+ return Collections.unmodifiableSet(modals);
+ }
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
new file mode 100644
index 00000000..bd203d47
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
@@ -0,0 +1,153 @@
+package com.github.kaktushose.jda.commands.reflect;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.TextInput;
+import net.dv8tion.jda.api.interactions.components.text.TextInput.Builder;
+import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Parameter;
+import java.util.Optional;
+
+/**
+ * Representation of a {@link TextInput} of a
+ * {@link com.github.kaktushose.jda.commands.annotations.interactions.Modal Modal}.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @see TextInput
+ * @see com.github.kaktushose.jda.commands.annotations.interactions.Modal Modal
+ * @since 4.0.0
+ */
+public class TextInputDefinition {
+
+ private final String label;
+ private final String placeholder;
+ private final String defaultValue;
+ private final int minValue;
+ private final int maxValue;
+ private final TextInputStyle style;
+ private final boolean required;
+
+ private TextInputDefinition(String label,
+ String placeholder,
+ String defaultValue,
+ int minValue,
+ int maxValue,
+ TextInputStyle style,
+ boolean required) {
+ this.label = label;
+ this.placeholder = placeholder;
+ this.defaultValue = defaultValue;
+ this.minValue = minValue;
+ this.maxValue = maxValue;
+ this.style = style;
+ this.required = required;
+ }
+
+ /**
+ * Builds a new TextInputDefinition.
+ *
+ * @param parameter the {@link Parameter} of the text input
+ * @return an {@link Optional} holding the TextInputDefinition
+ */
+ public static Optional build(@NotNull Parameter parameter) {
+ if (!parameter.isAnnotationPresent(TextInput.class)) {
+ return Optional.empty();
+ }
+
+ // TODO for now we only allow Strings, maybe add type adapting in the future
+ if (!String.class.isAssignableFrom(parameter.getType())) {
+ return Optional.empty();
+ }
+
+ TextInput textInput = parameter.getAnnotation(TextInput.class);
+
+ return Optional.of(new TextInputDefinition(
+ textInput.label().isEmpty() ? parameter.getName() : textInput.label(),
+ textInput.value(),
+ textInput.defaultValue(),
+ textInput.minValue(),
+ textInput.maxValue(),
+ textInput.style(),
+ textInput.required()
+ ));
+ }
+
+ /**
+ * Transforms this TextInputDefinition to a {@link net.dv8tion.jda.api.interactions.components.text.TextInput TextInput}.
+ *
+ * @return the transformed {@link net.dv8tion.jda.api.interactions.components.text.TextInput TextInput}
+ */
+ public net.dv8tion.jda.api.interactions.components.text.TextInput toTextInput() {
+ Builder textInput = net.dv8tion.jda.api.interactions.components.text.TextInput.create(label, label, style).setRequired(required);
+
+ if (minValue != -1) {
+ textInput.setMinLength(minValue);
+ }
+ if (maxValue != -1) {
+ textInput.setMaxLength(maxValue);
+ }
+ if (!placeholder.isBlank()) {
+ textInput.setPlaceholder(placeholder);
+ }
+ if (!placeholder.isBlank()) {
+ textInput.setValue(defaultValue);
+ }
+
+ return textInput.build();
+ }
+
+ /**
+ * Gets the label of the TextInput.
+ *
+ * @return the label of the TextInput
+ */
+ public String getLabel() {
+ return label;
+ }
+
+ /**
+ * Gets the placeholder of the TextInput.
+ *
+ * @return the placeholder of the TextInput
+ */
+ public String getPlaceholder() {
+ return placeholder;
+ }
+
+ /**
+ * Gets the minimum value of the TextInput.
+ *
+ * @return the minimum value of the TextInput
+ */
+ public int getMinValue() {
+ return minValue;
+ }
+
+ /**
+ * Gets the maximum value of the TextInput.
+ *
+ * @return the maximum value of the TextInput
+ */
+ public int getMaxValue() {
+ return maxValue;
+ }
+
+ /**
+ * Gets the {@link TextInputStyle} of the TextInput.
+ *
+ * @return the {@link TextInputStyle} of the TextInput
+ */
+ public TextInputStyle getStyle() {
+ return style;
+ }
+
+ /**
+ * Whether this TextInput is required.
+ *
+ * @return {@code true} if this TextInput is required
+ */
+ public boolean isRequired() {
+ return required;
+ }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
index e1256a05..10368af9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
@@ -18,9 +18,9 @@
* @see AutoComplete
* @since 4.0.0
*/
-public class AutoCompleteDefinition extends GenericInteraction {
+public class AutoCompleteDefinition extends GenericInteractionDefinition {
- private final Set commands;
+ private Set commands;
protected AutoCompleteDefinition(Method method, Set commands) {
super(method);
@@ -69,6 +69,15 @@ public static Optional build(@NotNull Method method, Lis
return Optional.of(new AutoCompleteDefinition(method, values));
}
+ /**
+ * Set the command names this AutoComplete can handle
+ *
+ * @param commands a set of command names
+ */
+ public void setCommandNames(Set commands) {
+ this.commands = commands;
+ }
+
/**
* Gets a set of names of all the commands this AutoComplete can handle
*
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ButtonDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ButtonDefinition.java
index c3574bb0..0d61303e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ButtonDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ButtonDefinition.java
@@ -2,11 +2,10 @@
import com.github.kaktushose.jda.commands.annotations.interactions.Button;
import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.buttons.ButtonEvent;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
import net.dv8tion.jda.api.entities.emoji.Emoji;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
import org.jetbrains.annotations.NotNull;
@@ -21,7 +20,7 @@
* @see Button
* @since 2.3.0
*/
-public class ButtonDefinition extends EphemeralInteraction {
+public class ButtonDefinition extends EphemeralInteractionDefinition {
private final String label;
private final Emoji emoji;
@@ -60,11 +59,11 @@ public static Optional build(@NotNull Method method) {
return Optional.empty();
}
- if (!ButtonEvent.class.isAssignableFrom(method.getParameters()[0].getType())) {
+ if (!ComponentEvent.class.isAssignableFrom(method.getParameters()[0].getType())) {
log.error("An error has occurred! Skipping Button {}.{}:",
method.getDeclaringClass().getSimpleName(),
method.getName(),
- new IllegalArgumentException(String.format("First parameter must be of type %s!", ButtonEvent.class.getSimpleName())));
+ new IllegalArgumentException(String.format("First parameter must be of type %s!", ComponentEvent.class.getSimpleName())));
return Optional.empty();
}
@@ -148,11 +147,11 @@ public ButtonStyle getStyle() {
* Gets the runtime id. The runtime id is composed of the static interaction id and the
* snowflake id of the interaction event that created the runtime.
*
- * @param context the {@link CommandContext} this button will be attached to
+ * @param context the {@link SlashCommandContext} this button will be attached to
* @return the runtime id
*/
@NotNull
- public String getRuntimeId(GenericContext context) {
+ public String getRuntimeId(Context context) {
return String.format("%s.%s", getId(), context.getRuntime().getInstanceId());
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteraction.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
similarity index 53%
rename from src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteraction.java
rename to src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
index f558dc68..d1ade2a0 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteraction.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
@@ -9,19 +9,29 @@
* @version 4.0.0
* @since 4.0.0
*/
-public abstract class EphemeralInteraction extends GenericInteraction {
+public abstract class EphemeralInteractionDefinition extends GenericInteractionDefinition {
protected boolean ephemeral;
- protected EphemeralInteraction(Method method, boolean ephemeral) {
+ protected EphemeralInteractionDefinition(Method method, boolean ephemeral) {
super(method);
this.ephemeral = ephemeral;
}
+ /**
+ * Gets whether replies should be ephemeral.
+ *
+ * @return {@code true} if replies should be ephemeral
+ */
public boolean isEphemeral() {
return ephemeral;
}
+ /**
+ * Sets whether replies should be ephemeral.
+ *
+ * @param ephemeral {@code true} if replies should be ephemeral
+ */
public void setEphemeral(boolean ephemeral) {
this.ephemeral = ephemeral;
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteraction.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
similarity index 92%
rename from src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteraction.java
rename to src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
index d6137cea..3a9ec84d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteraction.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
@@ -14,14 +14,14 @@
* @version 4.0.0
* @since 4.0.0
*/
-public abstract class GenericInteraction {
+public abstract class GenericInteractionDefinition {
- protected static final Logger log = LoggerFactory.getLogger(GenericInteraction.class);
+ protected static final Logger log = LoggerFactory.getLogger(GenericInteractionDefinition.class);
protected final String id;
protected final Method method;
- protected GenericInteraction(Method method) {
+ protected GenericInteractionDefinition(Method method) {
this.id = String.format("%s.%s", method.getDeclaringClass().getSimpleName(), method.getName());
this.method = method;
}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
new file mode 100644
index 00000000..45f33f1a
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
@@ -0,0 +1,128 @@
+package com.github.kaktushose.jda.commands.reflect.interactions;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.annotations.interactions.Modal;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalEvent;
+import com.github.kaktushose.jda.commands.reflect.TextInputDefinition;
+import net.dv8tion.jda.api.interactions.modals.Modal.Builder;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Representation of a Modal.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @see Modal
+ * @since 4.0.0
+ */
+public class ModalDefinition extends EphemeralInteractionDefinition {
+
+ private final String title;
+ private final List textInputs;
+
+ protected ModalDefinition(Method method, boolean ephemeral, String title, List textInputs) {
+ super(method, ephemeral);
+ this.title = title;
+ this.textInputs = textInputs;
+ }
+
+ /**
+ * Builds a new ModalDefinition.
+ *
+ * @param method the {@link Method} of the Modal
+ * @return an {@link Optional} holding the ModalDefinition
+ */
+ public static Optional build(@NotNull Method method) {
+ if (!method.isAnnotationPresent(Modal.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
+ return Optional.empty();
+ }
+
+ // Modals support up to 5 TextInputs
+ if (method.getParameters().length < 1 || method.getParameters().length > 6) {
+ log.error("An error has occurred! Skipping Modal {}.{}:",
+ method.getDeclaringClass().getSimpleName(),
+ method.getName(),
+ new IllegalArgumentException("Invalid amount of parameters!"));
+ return Optional.empty();
+ }
+
+ if (!ModalEvent.class.isAssignableFrom(method.getParameters()[0].getType())) {
+ log.error("An error has occurred! Skipping Modal {}.{}:",
+ method.getDeclaringClass().getSimpleName(),
+ method.getName(),
+ new IllegalArgumentException(String.format("First parameter must be of type %s!", ModalEvent.class.getSimpleName())));
+ return Optional.empty();
+ }
+
+ List textInputs = new ArrayList<>();
+ for (int i = 1; i < method.getParameters().length; i++) {
+ Parameter parameter = method.getParameters()[i];
+ TextInputDefinition.build(parameter).ifPresent(textInputs::add);
+ }
+
+ if (textInputs.isEmpty()) {
+ log.error("An error has occurred! Skipping Modal {}.{}:",
+ method.getDeclaringClass().getSimpleName(),
+ method.getName(),
+ new IllegalArgumentException("Modals need at least one valid TextInput"));
+ return Optional.empty();
+ }
+
+ Modal modal = method.getAnnotation(Modal.class);
+
+ return Optional.of(new ModalDefinition(method, modal.ephemeral(), modal.value(), textInputs));
+ }
+
+ /**
+ * Transforms this ModalDefinition to a {@link net.dv8tion.jda.api.interactions.modals.Modal Modal}.
+ *
+ * @param id the id to use, see {@link #getRuntimeId(Context)}
+ * @return the transformed {@link net.dv8tion.jda.api.interactions.modals.Modal Modal}
+ */
+ public net.dv8tion.jda.api.interactions.modals.Modal toModal(String id) {
+ Builder modal = net.dv8tion.jda.api.interactions.modals.Modal.create(id, title);
+
+ textInputs.forEach(textInput -> modal.addActionRow(textInput.toTextInput()));
+
+ return modal.build();
+ }
+
+ /**
+ * Gets the title of the modal.
+ *
+ * @return the title of the modal
+ */
+ public String getTitle() {
+ return title;
+ }
+
+ /**
+ * Gets all text inputs this modal uses
+ *
+ * @return a list of {@link TextInputDefinition TextInputDefinitions}
+ */
+ public List getTextInputs() {
+ return textInputs;
+ }
+
+ /**
+ * Gets the runtime id. The runtime id is composed of the static interaction id and the
+ * snowflake id of the interaction event that created the runtime.
+ *
+ * @param context the {@link SlashCommandContext} this button will be attached to
+ * @return the runtime id
+ */
+ @NotNull
+ public String getRuntimeId(Context context) {
+ return String.format("%s.%s", getId(), context.getRuntime().getInstanceId());
+ }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
new file mode 100644
index 00000000..bb1e96f5
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
@@ -0,0 +1,108 @@
+package com.github.kaktushose.jda.commands.reflect.interactions.commands;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.ContextCommand;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
+import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
+import net.dv8tion.jda.api.interactions.commands.build.CommandData;
+import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Representation of a ContextMenu command.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @see ContextCommand
+ * @since 4.0.0
+ */
+public class ContextCommandDefinition extends GenericCommandDefinition {
+
+ public ContextCommandDefinition(Method method,
+ boolean ephemeral,
+ String name,
+ Set permissions,
+ boolean isGuildOnly,
+ boolean isNSFW,
+ Command.Type commandType,
+ Set enabledPermissions,
+ SlashCommand.CommandScope scope,
+ LocalizationFunction localizationFunction) {
+ super(method, ephemeral, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
+ }
+
+ public static Optional build(@NotNull Method method, @NotNull LocalizationFunction localizationFunction) {
+ if (!method.isAnnotationPresent(ContextCommand.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
+ return Optional.empty();
+ }
+
+ ContextCommand command = method.getAnnotation(ContextCommand.class);
+
+ if (!command.isActive()) {
+ log.debug("Command {} is set inactive. Skipping this command!", method.getName());
+ return Optional.empty();
+ }
+
+ Set permissions = new HashSet<>();
+ if (method.isAnnotationPresent(Permissions.class)) {
+ Permissions permission = method.getAnnotation(Permissions.class);
+ permissions = new HashSet<>(Arrays.asList(permission.value()));
+ }
+
+ Set enabledFor = Arrays.stream(command.enabledFor()).collect(Collectors.toSet());
+ if (enabledFor.size() == 1 && enabledFor.contains(net.dv8tion.jda.api.Permission.UNKNOWN)) {
+ enabledFor.clear();
+ }
+
+ return Optional.of(new ContextCommandDefinition(
+ method,
+ command.ephemeral(),
+ command.value(),
+ permissions,
+ command.isGuildOnly(),
+ command.isNSFW(),
+ command.type(),
+ enabledFor,
+ command.scope(),
+ localizationFunction
+ ));
+ }
+
+ @Override
+ public CommandData toCommandData() {
+ CommandData command = Commands.context(commandType, name);
+ command.setGuildOnly(isGuildOnly)
+ .setNSFW(isNSFW)
+ .setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions))
+ .setLocalizationFunction(localizationFunction);
+ return command;
+ }
+
+ @Override
+ public String toString() {
+ return "ContextCommandDefinition{" +
+ "id='" + id + '\'' +
+ ", method=" + method +
+ ", name='" + name + '\'' +
+ ", permissions=" + permissions +
+ ", isGuildOnly=" + isGuildOnly +
+ ", isNSFW=" + isNSFW +
+ ", commandType=" + commandType +
+ ", enabledPermissions=" + enabledPermissions +
+ ", scope=" + scope +
+ ", localizationFunction=" + localizationFunction +
+ ", ephemeral=" + ephemeral +
+ '}';
+ }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
new file mode 100644
index 00000000..74424629
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
@@ -0,0 +1,146 @@
+package com.github.kaktushose.jda.commands.reflect.interactions.commands;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.build.CommandData;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Method;
+import java.util.Set;
+
+/**
+ * Generic base class of different command types.
+ *
+ * @author Kaktushose
+ * @version 4.0.0
+ * @see SlashCommandDefinition
+ * @see ContextCommandDefinition
+ * @since 4.0.0
+ */
+public abstract class GenericCommandDefinition extends EphemeralInteractionDefinition implements Comparable {
+
+ protected final String name;
+ protected final Set permissions;
+ protected final boolean isGuildOnly;
+ protected final boolean isNSFW;
+ protected final Command.Type commandType;
+ protected final Set