Fix command execution & add command level middlewares with parser.

src/main/java/pw/mihou/velen/builders/VelenCommandBuilder.java

@@ -8,6 +8,7 @@
 import pw.mihou.velen.impl.VelenCommandImpl;
 import pw.mihou.velen.interfaces.*;
 import pw.mihou.velen.interfaces.messages.types.VelenConditionalMessage;
+import pw.mihou.velen.interfaces.middleware.VelenMiddleware;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -37,6 +38,7 @@ public class VelenCommandBuilder {
  private Duration cooldown;
  private boolean serverOnly = false;
  private boolean privateOnly = false;
+ private final List<String> middlewares = new ArrayList<>();
  private VelenEvent velenEvent;
  private Velen velen;
 
@@ -376,6 +378,17 @@ public VelenCommandBuilder setServerOnly(boolean serverOnly) {
  return this;
  }
 
+ /**
+ * Adds a middleware to this command.
+ *
+ * @param middlewares The middlewares to add.
+ * @return VelenCommandBuilder for chain calling methods.
+ */
+ public VelenCommandBuilder addMiddlewares(String... middlewares) {
+ this.middlewares.addAll(Arrays.asList(middlewares));
+ return this;
+ }
+
  /**
  * Should this command be private-channel only?
  *
@@ -469,7 +482,11 @@ public VelenCommand build() {
  VelenCommandImpl.Handlers handlers = new VelenCommandImpl
  .Handlers(velenEvent, velenSlashEvent, velenHybridHandler);
 
- return new VelenCommandImpl(general, requires, conditional, settings, handlers, velen);
+ VelenCommandImpl.Warehouse warehouse = new VelenCommandImpl.Warehouse(middlewares
+ .stream().map(s -> velen.getMiddleware(s).orElseThrow(() -> new IllegalStateException("The middleware " + s + " couldn't be found.")))
+ .collect(Collectors.toList()));
+
+ return new VelenCommandImpl(general, requires, conditional, settings, handlers, warehouse, velen);
 
  }
 

src/main/java/pw/mihou/velen/impl/VelenCommandImpl.java

@@ -8,6 +8,7 @@
 import pw.mihou.velen.impl.commands.children.BaseMessageCommand;
 import pw.mihou.velen.interfaces.*;
 import pw.mihou.velen.interfaces.messages.types.VelenConditionalMessage;
+import pw.mihou.velen.interfaces.middleware.VelenMiddleware;
 
 import java.time.Duration;
 import java.util.*;
@@ -22,18 +23,20 @@ public class VelenCommandImpl implements VelenCommand {
  private final ConditionalCollective conditional;
  private final Settings settings;
  private final Handlers handlers;
+ private final Warehouse warehouse;
 
  private final BaseMessageCommand baseMessageCommand = new BaseMessageCommand(this);
  private final BaseInteractionCommand baseInteractionCommand = new BaseInteractionCommand(this);
 
  public VelenCommandImpl(GeneralCollective general, RequireCollective requires, ConditionalCollective conditional,
- Settings settings, Handlers handlers, Velen velen) {
+ Settings settings, Handlers handlers, Warehouse warehouse, Velen velen) {
  this.general = general;
  this.requires = requires;
  this.conditional = conditional;
  this.settings = settings;
  this.handlers = handlers;
  this.velen = velen;
+ this.warehouse = warehouse;
  }
 
  /**
@@ -150,6 +153,11 @@ public String getCategory() {
  return general.category;
  }
 
+ @Override
+ public List<VelenMiddleware> getMiddlewares() {
+ return warehouse.getMiddlewares();
+ }
+
  @Override
  public boolean equals(Object o) {
  if (this == o) return true;
@@ -251,6 +259,31 @@ public Velen getVelen() {
  return velen;
  }
 
+
+ public static class Warehouse {
+ private final List<VelenMiddleware> middlewares;
+
+ /**
+ * Creates a brand new warehouse that can store
+ * middlewares and afterwares.
+ *
+ * @param middlewares The middlewares to store.
+ */
+ public Warehouse(List<VelenMiddleware> middlewares) {
+ this.middlewares = middlewares;
+ }
+
+ /**
+ * Retrieves all the middlewares of this command.
+ *
+ * @return All the middlewares being used in this command.
+ */
+ public List<VelenMiddleware> getMiddlewares() {
+ return middlewares;
+ }
+
+ }
+
  public static class RequireCollective {
  public final List<Long> requiredRoles;
  public final List<Long> requiredUsers;

src/main/java/pw/mihou/velen/impl/commands/BaseCommandImplementation.java

@@ -18,6 +18,7 @@
 import pw.mihou.velen.ratelimiter.entities.RatelimitEntity;
 import pw.mihou.velen.utils.Pair;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -81,8 +82,11 @@ public boolean applyRestraints(SlashCommandCreateEvent event) {
  throw new IllegalStateException("The channel is somehow not present; this is possibly a change in Discord's side " +
  "and may need to be addressed, please send an issue @ https:/ShindouMihou/Velen");
 
- return !instance.getRequiredUsers().isEmpty() && !instance.getRequiredUsers()
- .contains(event.getInteraction().getUser().getId());
+ if (!instance.getRequiredUsers().isEmpty() && !instance.getRequiredUsers()
+ .contains(event.getInteraction().getUser().getId()))
+ return false;
+
+ return true;
  }
 
 
@@ -99,8 +103,11 @@ public boolean applyRestraints(MessageCreateEvent event) {
  if (instance.isPrivateOnly() && event.getServer().isPresent())
  return false;
 
- return !instance.getRequiredUsers().isEmpty() && !instance.getRequiredUsers()
- .contains(event.getMessageAuthor().getId());
+ if (!instance.getRequiredUsers().isEmpty() && !instance.getRequiredUsers()
+ .contains(event.getMessageAuthor().getId()))
+ return false;
+
+ return true;
  }
 
  /**
@@ -199,6 +206,55 @@ public boolean applySlashRestraints(SlashCommandCreateEvent event) {
  .stream().allMatch(function -> function.apply(event));
  }
 
+ /**
+ * Gets all the hybrid middlewares of this command.
+ *
+ * @return All the hybrid middlewares for this command.
+ */
+ public List<VelenHybridMiddleware> getHybridMiddlewares() {
+ List<VelenHybridMiddleware> middlewares = new ArrayList<>();
+
+ if (instance.getVelen().findCategory(instance.getCategory()) != null) {
+ middlewares.addAll(instance.getVelen().findCategory(instance.getCategory()).getHybridMiddlewares());
+ }
+
+ middlewares.addAll(instance.getHybridMiddlewares());
+ return middlewares;
+ }
+
+ /**
+ * Gets all the message middlewares of this command.
+ *
+ * @return All the message middlewares for this command.
+ */
+ public List<VelenMessageMiddleware> getMessageMiddlewares() {
+ List<VelenMessageMiddleware> middlewares = new ArrayList<>();
+
+ if (instance.getVelen().findCategory(instance.getCategory()) != null) {
+ middlewares.addAll(instance.getVelen().findCategory(instance.getCategory()).getMessageMiddlewares());
+ }
+
+ middlewares.addAll(instance.getMessageMiddlewares());
+ return middlewares;
+ }
+
+
+ /**
+ * Gets all the slash middlewares of this command.
+ *
+ * @return All the slash middlewares for this command.
+ */
+ public List<VelenSlashMiddleware> getSlashMiddlewares() {
+ List<VelenSlashMiddleware> middlewares = new ArrayList<>();
+
+ if (instance.getVelen().findCategory(instance.getCategory()) != null) {
+ middlewares.addAll(instance.getVelen().findCategory(instance.getCategory()).getSlashMiddlewares());
+ }
+
+ middlewares.addAll(instance.getSlashMiddlewares());
+ return middlewares;
+ }
+
  /**
  * Dispatches an event for slash commands.
  *
@@ -210,22 +266,20 @@ public void dispatch(SlashCommandCreateEvent event) {
  instance.getName() + ".");
 
  if (instance.getHybridHandler() == null) {
- if (instance.getVelen().findCategory(instance.getCategory()) != null) {
- Pair<Boolean, String> middlewareResponse = applySlashMiddlewares(
- instance.getVelen().findCategory(instance.getCategory()).getSlashMiddlewares(),
- event
- );
-
- if (!middlewareResponse.getLeft()) {
- if (middlewareResponse.getRight() != null) {
- event.getSlashCommandInteraction()
- .createImmediateResponder()
- .setContent(middlewareResponse.getRight())
- .setFlags(InteractionCallbackDataFlag.EPHEMERAL)
- .respond();
- }
- return;
+ Pair<Boolean, String> middlewareResponse = applySlashMiddlewares(
+ getSlashMiddlewares(),
+ event
+ );
+
+ if (!middlewareResponse.getLeft()) {
+ if (middlewareResponse.getRight() != null) {
+ event.getSlashCommandInteraction()
+ .createImmediateResponder()
+ .setContent(middlewareResponse.getRight())
+ .setFlags(InteractionCallbackDataFlag.EPHEMERAL)
+ .respond();
  }
+ return;
  }
 
  instance.getInteractionHandler()
@@ -238,21 +292,19 @@ public void dispatch(SlashCommandCreateEvent event) {
  } else {
  VelenGeneralEvent e = new VelenGeneralEventImpl(instance.getName(), event, null, null, instance);
 
- if (instance.getVelen().findCategory(instance.getCategory()) != null) {
- Pair<Boolean, String> middlewareResponse = applyHybridMiddlewares(
- instance.getVelen().findCategory(instance.getCategory()).getHybridMiddlewares(),
- e
- );
-
- if (!middlewareResponse.getLeft()) {
- if (middlewareResponse.getRight() != null) {
- e.createResponder()
- .setContent(middlewareResponse.getRight())
- .setFlags(InteractionCallbackDataFlag.EPHEMERAL)
- .respond();
- }
- return;
+ Pair<Boolean, String> middlewareResponse = applyHybridMiddlewares(
+ getHybridMiddlewares(),
+ e
+ );
+
+ if (!middlewareResponse.getLeft()) {
+ if (middlewareResponse.getRight() != null) {
+ e.createResponder()
+ .setContent(middlewareResponse.getRight())
+ .setFlags(InteractionCallbackDataFlag.EPHEMERAL)
+ .respond();
  }
+ return;
  }
 
  instance.getHybridHandler().onEvent(e, e.createResponder(), e.getUser(), e.getArguments());
@@ -273,39 +325,35 @@ public void dispatch(MessageCreateEvent event, String[] args) {
 
  if (instance.getHybridHandler() == null) {
 
- if (instance.getVelen().findCategory(instance.getCategory()) != null) {
- Pair<Boolean, String> middlewareResponse = applyMessageMiddlewares(
- instance.getVelen().findCategory(instance.getCategory()).getMessageMiddlewares(),
- event
- );
-
- if (!middlewareResponse.getLeft()) {
- if (middlewareResponse.getRight() != null) {
- event.getMessage().reply(middlewareResponse.getRight());
- }
- return;
+ Pair<Boolean, String> middlewareResponse = applyMessageMiddlewares(
+ getMessageMiddlewares(),
+ event
+ );
+
+ if (!middlewareResponse.getLeft()) {
+ if (middlewareResponse.getRight() != null) {
+ event.getMessage().reply(middlewareResponse.getRight());
  }
+ return;
  }
 
  instance.getMessageHandler().onEvent(event, event.getMessage(), u, args, new VelenRoutedOptions(instance, event));
  } else {
  VelenGeneralEvent e = new VelenGeneralEventImpl(instance.getName(), null, event, args, instance);
 
- if (instance.getVelen().findCategory(instance.getCategory()) != null) {
- Pair<Boolean, String> middlewareResponse = applyHybridMiddlewares(
- instance.getVelen().findCategory(instance.getCategory()).getHybridMiddlewares(),
- e
- );
-
- if (!middlewareResponse.getLeft()) {
- if (middlewareResponse.getRight() != null) {
- e.createResponder()
- .setContent(middlewareResponse.getRight())
- .setFlags(InteractionCallbackDataFlag.EPHEMERAL)
- .respond();
- }
- return;
+ Pair<Boolean, String> middlewareResponse = applyHybridMiddlewares(
+ getHybridMiddlewares(),
+ e
+ );
+
+ if (!middlewareResponse.getLeft()) {
+ if (middlewareResponse.getRight() != null) {
+ e.createResponder()
+ .setContent(middlewareResponse.getRight())
+ .setFlags(InteractionCallbackDataFlag.EPHEMERAL)
+ .respond();
  }
+ return;
  }
 
  instance.getHybridHandler().onEvent(e, e.createResponder(), e.getUser(), e.getArguments());

src/main/java/pw/mihou/velen/interfaces/Velen.java

@@ -90,7 +90,7 @@ static VelenBuilder builder() {
  * @param middleware The middleware itself.
  * @return The Velen instance for chain-calling methods.
  */
- default Velen addMiddleware(String name, VelenHybridMiddleware middleware) {
+ default Velen addHybridMiddleware(String name, VelenHybridMiddleware middleware) {
  return storeMiddleware(name, middleware);
  }
 
@@ -102,7 +102,7 @@ default Velen addMiddleware(String name, VelenHybridMiddleware middleware) {
  * @param middleware The middleware itself.
  * @return The Velen instance for chain-calling methods.
  */
- default Velen addMiddleware(String name, VelenMessageMiddleware middleware) {
+ default Velen addMessageMiddleware(String name, VelenMessageMiddleware middleware) {
  return storeMiddleware(name, middleware);
  }
 
@@ -114,7 +114,7 @@ default Velen addMiddleware(String name, VelenMessageMiddleware middleware) {
  * @param middleware The middleware itself.
  * @return The Velen instance for chain-calling methods.
  */
- default Velen addMiddleware(String name, VelenSlashMiddleware middleware) {
+ default Velen addSlashMiddleware(String name, VelenSlashMiddleware middleware) {
  return storeMiddleware(name, middleware);
  }