Merge branch 'main' into other/formatter

# Conflicts:
#	gradle/libs.versions.toml

Author: Kaktushose

core/src/main/java/io/github/kaktushose/jdac/JDACBuilder.java

@@ -1,6 +1,5 @@
 package io.github.kaktushose.jdac;
 
-import dev.goldmensch.fluava.Fluava;
 import io.github.kaktushose.jdac.configuration.Extension;
 import io.github.kaktushose.jdac.configuration.ExtensionFilter;
 import io.github.kaktushose.jdac.configuration.Property;
@@ -127,7 +126,7 @@ public class JDACBuilder {
         addFallback(GLOBAL_REPLY_CONFIG, _ -> new ReplyConfig());
         addFallback(SHUTDOWN_JDA, _ -> true);
         addFallback(LOCALIZE_COMMANDS, _ -> true);
-        addFallback(LOCALIZER, _ -> new FluavaLocalizer(Fluava.create(Locale.ENGLISH)));
+        addFallback(LOCALIZER, _ -> FluavaLocalizer.create(Locale.ENGLISH));
         addFallback(PERMISSION_PROVIDER, _ -> new DefaultPermissionsProvider());
         addFallback(ERROR_MESSAGE_FACTORY, ctx -> new DefaultErrorMessageFactory(ctx.get(MESSAGE_RESOLVER)));
         addFallback(GUILD_SCOPE_PROVIDER, _ -> new DefaultGuildScopeProvider());
@@ -155,7 +154,7 @@ public class JDACBuilder {
         });
         addFallback(EMBEDS, ctx -> ctx.get(EMBED_CONFIG_INTERNAL).build());
 
-        addFallback(LOCALIZATION_FUNCTION, ctx -> new JDACLocalizationFunction(ctx.get(BUNDLE_FINDER), ctx.get(DEFINITIONS), ctx.get(MESSAGE_RESOLVER)));
+        addFallback(LOCALIZATION_FUNCTION, JDACLocalizationFunction.PROVIDER_FUNC);
         addFallback(BUNDLE_FINDER, ctx -> new BundleFinder(ctx.get(DESCRIPTOR)));
         addFallback(I18N, ctx -> new I18n(ctx.get(BUNDLE_FINDER), ctx.get(LOCALIZER)));
 
@@ -360,14 +359,14 @@ public <T> JDACBuilder setProperty(Property<T> property, Function<PropertyProvid
     /// This method applies all found implementations of [Extension],
     /// instantiates an instance of [JDACommands] and starts the framework.
     public JDACommands start() {
+        log.info("Starting JDA-Commands...");
+
         Extensions extensions = loadExtensions();
 
         IntrospectionImpl introspection = new IntrospectionImpl(new Lifecycle(), properties.createResolver(), Stage.CONFIGURATION);
 
         return ScopedValue.where(IntrospectionImpl.INTROSPECTION, introspection).call(() -> {
             try {
-                log.info("Starting JDA-Commands...");
-
                 Middlewares middlewares = new Middlewares(introspection.get(MIDDLEWARE), introspection.get(ERROR_MESSAGE_FACTORY), introspection.get(PERMISSION_PROVIDER));
                 TypeAdapters typeAdapters = new TypeAdapters(introspection.get(TYPE_ADAPTER), introspection.get(MESSAGE_RESOLVER));
 

core/src/main/java/io/github/kaktushose/jdac/JDACommands.java

@@ -17,6 +17,7 @@
 import io.github.kaktushose.jdac.embeds.EmbedConfig;
 import io.github.kaktushose.jdac.embeds.EmbedDataSource;
 import io.github.kaktushose.jdac.embeds.internal.Embeds;
+import io.github.kaktushose.jdac.exceptions.internal.JDACException;
 import io.github.kaktushose.jdac.internal.JDAContext;
 import io.github.kaktushose.jdac.internal.logging.JDACLogger;
 import io.github.kaktushose.jdac.internal.register.CommandUpdater;
@@ -115,7 +116,7 @@ void start(Extensions extensions) {
             log.debug("Run Extension#onStart()");
             extensions.callOnStart(this);
 
-            log.info("Finished loading!");
+            System.out.printf("\n%s\n\n", JDACException.errorMessage("starting-message"));
 
             introspection.publish(new FrameworkStartEvent());
         });

core/src/main/java/io/github/kaktushose/jdac/definitions/interactions/command/OptionDataDefinition.java

@@ -13,6 +13,7 @@
 import io.github.kaktushose.jdac.dispatching.events.Event;
 import io.github.kaktushose.jdac.dispatching.events.interactions.CommandEvent;
 import io.github.kaktushose.jdac.dispatching.events.interactions.ComponentEvent;
+import io.github.kaktushose.jdac.dispatching.events.interactions.ModalEvent;
 import io.github.kaktushose.jdac.dispatching.validation.Validator;
 import io.github.kaktushose.jdac.dispatching.validation.internal.Validators;
 import io.github.kaktushose.jdac.exceptions.ConfigurationException;
@@ -128,10 +129,13 @@ public static OptionDataDefinition build(ParameterDescription parameter,
         if (Event.class.isAssignableFrom(resolvedType)) {
             String guessedType = "";
             if (resolvedType.equals(ComponentEvent.class)) {
-                guessedType = "CommandEvent";
+                guessedType = "Perhaps you wanted to write CommandEvent?";
             }
             if (resolvedType.equals(CommandEvent.class)) {
-                guessedType = "ComponentEvent";
+                guessedType = "Perhaps you wanted to write ComponentEvent?";
+            }
+            if (resolvedType.equals(ModalEvent.class)) {
+                guessedType = "Perhaps you wanted to write CommandEvent or ComponentEvent?";
             }
             throw new InvalidDeclarationException(
                     "invalid-option-data",

core/src/main/java/io/github/kaktushose/jdac/dispatching/events/Event.java

@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 import static io.github.kaktushose.jdac.introspection.internal.IntrospectionAccess.*;
 
@@ -114,6 +115,16 @@ public String resolve(String message, Entry... placeholders) {
         return messageResolver().resolve(message, jdaEvent().getUserLocale(), placeholders);
     }
 
+    /// Resolved the given message with help of the underlying [MessageResolver] instance,
+    /// thus performing localization and emoji resolution.
+    ///
+    /// Automatically resolves the [Locale] using [GenericInteractionCreateEvent#getUserLocale()].
+    /// Use [MessageResolver#resolve(String, Locale, Map)] (obtained via [#messageResolver()]) if you want to use a different locale.
+    ///
+    /// @return the resolved message
+    public String resolve(String message, Map<String, @Nullable Object> placeholders) {
+        return messageResolver().resolve(message, jdaEvent().getUserLocale(), placeholders);
+    }
 
     @Override
     public int getTypeRaw() {

core/src/main/java/io/github/kaktushose/jdac/dispatching/events/ModalReplyableEvent.java

@@ -101,6 +101,6 @@ private void reply(@Nullable Class<?> origin, String modal, Collection<ModalTopL
         );
 
         log.debug("Replying to interaction \"{}\" with Modal: \"{}\". [Runtime={}]", definition.displayName(), modalDefinition.displayName(), runtimeId());
-        callback.replyModal(modalDefinition.toJDAEntity(new CustomId(runtimeId(), definitionId))).queue();
+        callback.replyModal(modalDefinition.toJDAEntity(new CustomId(runtimeId(), definitionId))).complete();
     }
 }

core/src/main/java/io/github/kaktushose/jdac/dispatching/events/interactions/AutoCompleteEvent.java

@@ -33,7 +33,7 @@ public final class AutoCompleteEvent extends Event<CommandAutoCompleteInteractio
      *                                  </ul>
      */
     public void replyChoices(Collection<Command.Choice> choices) {
-        jdaEvent().replyChoices(choices).queue();
+        jdaEvent().replyChoices(choices).complete();
     }
 
     /**

core/src/main/java/io/github/kaktushose/jdac/dispatching/handling/EventHandler.java

@@ -148,7 +148,7 @@ private void invoke(InvocationContext<T> invocation, Runtime runtime, Introspect
             if (invocation.event() instanceof GenericComponentInteractionCreateEvent componentEvent && !edit) {
                 Message message = componentEvent.getMessage();
                 if (Helpers.isValidWithoutComponents(message)) {
-                    message.editMessageComponents().queue();
+                    message.editMessageComponents().complete();
                 } else {
                     edit = true;
                 }

core/src/main/java/io/github/kaktushose/jdac/dispatching/handling/command/SlashCommandHandler.java

@@ -105,7 +105,7 @@ protected PreparationResult prepare(SlashCommandInteractionEvent event, Runtime
                                     .setEphemeral(replyConfig.ephemeral())
                                     .setSuppressedNotifications(replyConfig.silent())
                                     .setAllowedMentions(replyConfig.allowedMentions())
-                                    .queue();
+                                    .complete();
                             return Optional.empty();
                         }
                         case NO_PATH_FOUND, NO_LOSSLESS_CONVERSION -> throw new InternalException(

core/src/main/java/io/github/kaktushose/jdac/dispatching/middleware/Priority.java

@@ -6,7 +6,7 @@
 // !! order matters, because enums are compared by ordinal number (java.lang.Comparable)
 public enum Priority {
     /// Middlewares with priority PERMISSIONS will always be executed first
-    PERMISSIONS,
+    HIGHEST,
     /// Highest priority for custom implementation, will be executed right after internal middlewares.
     HIGH,
     /// Default priority.

core/src/main/java/io/github/kaktushose/jdac/dispatching/middleware/internal/Middlewares.java

@@ -17,15 +17,15 @@ public class Middlewares {
 
     public Middlewares(Collection<Map.Entry<Priority, Middleware>> userDefined, ErrorMessageFactory errorMessageFactory, PermissionsProvider permissionsProvider) {
         SortedMap<Priority, Set<Middleware>> middlewareMap = new TreeMap<>(Map.of(
-                Priority.PERMISSIONS, new HashSet<>(List.of(new PermissionsMiddleware(permissionsProvider, errorMessageFactory))),
+                Priority.HIGHEST, new HashSet<>(List.of(new PermissionsMiddleware(permissionsProvider, errorMessageFactory))),
                 Priority.NORMAL, new HashSet<>(List.of(new ConstraintMiddleware(errorMessageFactory))),
                 Priority.HIGH, new HashSet<>(),
                 Priority.LOW, new HashSet<>()
         ));
 
         userDefined.forEach(entry -> middlewareMap.get(entry.getKey()).add(entry.getValue()));
 
-        middlewareMap.computeIfPresent(Priority.PERMISSIONS, (_, set) -> Collections.unmodifiableSet(set));
+        middlewareMap.computeIfPresent(Priority.HIGHEST, (_, set) -> Collections.unmodifiableSet(set));
         middlewareMap.computeIfPresent(Priority.HIGH, (_, set) -> Collections.unmodifiableSet(set));
         middlewareMap.computeIfPresent(Priority.NORMAL, (_, set) -> Collections.unmodifiableSet(set));
         middlewareMap.computeIfPresent(Priority.LOW, (_, set) -> Collections.unmodifiableSet(set));