add CommandConverter logic and wrapper implementations

2025-03-03 23:32:25 +01:00
parent 823402e0cd
commit 56b668851b
5 changed files with 207 additions and 157 deletions
--- a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JConverterSpec.java
+++ b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JConverterSpec.java
@@ -0,0 +1,75 @@
+package net.tomatentum.marinara.wrapper.discord4j;
+
+import java.util.List;
+
+import discord4j.core.object.command.ApplicationCommandOption.Type;
+import discord4j.discordjson.json.ApplicationCommandOptionChoiceData;
+import discord4j.discordjson.json.ApplicationCommandOptionData;
+import discord4j.discordjson.json.ApplicationCommandRequest;
+import net.tomatentum.marinara.interaction.commands.CommandConverter;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOptionChoice;
+import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
+import net.tomatentum.marinara.interaction.ident.RootCommandIdentifier;
+
+public class Discord4JConverterSpec implements CommandConverter.Spec<ApplicationCommandRequest, ApplicationCommandOptionData, ApplicationCommandOptionChoiceData> {
+
+	@Override
+	public ApplicationCommandRequest convertCommand(RootCommandIdentifier rootIdentifier,
+			List<ApplicationCommandOptionData> options) {
+        return ApplicationCommandRequest.builder()
+            .name(rootIdentifier.name())
+            .description(rootIdentifier.description())
+            .options(options)
+            .build();
+	}
+
+	@Override
+	public ApplicationCommandOptionData convertSubCommandGroup(InteractionIdentifier identifier,
+			List<ApplicationCommandOptionData> subCommands) {
+		return ApplicationCommandOptionData.builder()
+			.type(Type.SUB_COMMAND_GROUP.getValue())
+			.name(identifier.name())
+			.description(identifier.description())
+			.options(subCommands)
+			.build();
+	}
+
+	@Override
+	public ApplicationCommandOptionData convertSubCommand(InteractionIdentifier identifier,
+			List<ApplicationCommandOptionData> options) {
+        return ApplicationCommandOptionData.builder()
+            .type(Type.SUB_COMMAND_GROUP.getValue())
+            .name(identifier.name())
+            .description(identifier.description())
+            .options(options)
+            .build();
+	}
+
+	@Override
+	public ApplicationCommandOptionData convertOption(SlashCommandOption option,
+			List<ApplicationCommandOptionChoiceData> choices) {
+		Type type = Type.of(option.type().getValue());
+        return ApplicationCommandOptionData.builder()
+            .type(type.getValue())
+            .name(option.name())
+            .description(option.description())
+            .required(option.required())
+            .autocomplete(option.autocomplete())
+            .choices(choices)
+            .build();
+	}
+
+	@Override
+	public ApplicationCommandOptionChoiceData convertChoice(SlashCommandOptionChoice choice) {
+		var builder = ApplicationCommandOptionChoiceData.builder().name(choice.name());
+		if (choice.longValue() != Long.MAX_VALUE)
+			builder.value(choice.longValue());
+		if (choice.doubleValue() != Double.MAX_VALUE)
+			builder.value(choice.doubleValue());
+		if (!choice.stringValue().isEmpty())
+			builder.value(choice.stringValue());
+		return builder.build();
+	}
+	
+}
--- a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java
+++ b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java
@@ -1,7 +1,6 @@
 package net.tomatentum.marinara.wrapper.discord4j;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.function.Function;
@@ -20,12 +19,9 @@ import discord4j.discordjson.json.ApplicationCommandOptionData;
 import discord4j.discordjson.json.ApplicationCommandRequest;

 import net.tomatentum.marinara.interaction.InteractionType;
+import net.tomatentum.marinara.interaction.commands.CommandConverter;
 import net.tomatentum.marinara.interaction.commands.SlashCommandDefinition;
-import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption;
-import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOptionChoice;
 import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
-import net.tomatentum.marinara.interaction.ident.RootCommandIdentifier;
-import net.tomatentum.marinara.interaction.ident.SlashCommandIdentifier;
 import net.tomatentum.marinara.util.LoggerUtil;
 import net.tomatentum.marinara.wrapper.ContextObjectProvider;
 import net.tomatentum.marinara.wrapper.LibraryWrapper;
@@ -44,12 +40,15 @@ public class Discord4JWrapper extends LibraryWrapper {

    private GatewayDiscordClient api;
    private Discord4JContextObjectProvider contextObjectProvider;
+    private CommandConverter<ApplicationCommandRequest, ApplicationCommandOptionData, ApplicationCommandOptionChoiceData> commandConverter;

    private Logger logger = LoggerUtil.getLogger(getClass());

    public Discord4JWrapper(GatewayDiscordClient api) {
        this.api = api;
        this.contextObjectProvider = new Discord4JContextObjectProvider();
+        this.commandConverter = CommandConverter.of(new Discord4JConverterSpec());
+
        if (api != null)
            api.on(InteractionCreateEvent.class)
                .subscribe(event -> handleInteraction(event));
@@ -66,7 +65,7 @@ public class Discord4JWrapper extends LibraryWrapper {
        long applicationId = api.getRestClient().getApplicationId().block();

        for (SlashCommandDefinition slashCommandDefinition : defs) {
-            ApplicationCommandRequest request = convertSlashCommand(slashCommandDefinition);
+            ApplicationCommandRequest request = this.commandConverter.convert(slashCommandDefinition);
            if (slashCommandDefinition.rootIdentifier().serverIds().length > 0) {
                for (long serverId : slashCommandDefinition.rootIdentifier().serverIds()) {
                    serverCommands.putIfAbsent(serverId, new ArrayList<>());
@@ -128,72 +127,6 @@ public class Discord4JWrapper extends LibraryWrapper {
        return last;
    }

-    private ApplicationCommandRequest convertSlashCommand(SlashCommandDefinition def) {
-        List<ApplicationCommandOptionData> options = new ArrayList<>();
-        RootCommandIdentifier cmd = def.rootIdentifier();
-        if (!def.isRootCommand()) {
-            Arrays.stream(def.getSubCommands(null)).map(this::convertSubCommandDef).forEach(options::add);
-            Arrays.stream(def.getSubCommandGroups()).map((x) -> convertSubCommandGroupDef(def, x)).forEach(options::add);
-        }else {
-            Arrays.stream(cmd.options()).map(this::convertOptionDef).forEach(options::add);
-        }
-
-        return ApplicationCommandRequest.builder()
-            .name(cmd.name())
-            .description(cmd.description())
-            .options(options)
-            .build();
-    }
-
-    private ApplicationCommandOptionData convertSubCommandGroupDef(SlashCommandDefinition def, SlashCommandIdentifier subGroup) {
-        SlashCommandIdentifier[] subCommands = def.getSubCommands(subGroup.name());
-        List<ApplicationCommandOptionData> convertedSubCommands = Arrays.stream(subCommands).map(this::convertSubCommandDef).toList();
-        return ApplicationCommandOptionData.builder()
-            .type(Type.SUB_COMMAND_GROUP.getValue())
-            .name(subGroup.name())
-            .description(subGroup.description())
-            .options(convertedSubCommands)
-            .build();
-    }
-
-    private ApplicationCommandOptionData convertSubCommandDef(SlashCommandIdentifier sub) {
-        List<ApplicationCommandOptionData> convertedOptions = Arrays.stream(sub.options()).map(this::convertOptionDef).toList();
-        return ApplicationCommandOptionData.builder()
-            .type(Type.SUB_COMMAND_GROUP.getValue())
-            .name(sub.name())
-            .description(sub.description())
-            .options(convertedOptions)
-            .build();
-    }
-
-    private ApplicationCommandOptionData convertOptionDef(SlashCommandOption option) {
-        Type type = Enum.valueOf(Type.class, option.type().toString());
-        return ApplicationCommandOptionData.builder()
-            .type(type.getValue())
-            .name(option.name())
-            .description(option.description())
-            .required(option.required())
-            .autocomplete(option.autocomplete())
-            .choices(convertChoices(option))
-            .build();
-    }
-
-    private List<ApplicationCommandOptionChoiceData> convertChoices(SlashCommandOption option) {
-        List<ApplicationCommandOptionChoiceData> convertedChoices = new ArrayList<>();
-        for (SlashCommandOptionChoice choice : SlashCommandDefinition.getActualChoices(option)) {
-            var builder = ApplicationCommandOptionChoiceData.builder();
-            builder.name(choice.name());
-            if (choice.longValue() != Long.MAX_VALUE)
-                builder.value(choice.longValue());
-            if (choice.doubleValue() != Double.MAX_VALUE)
-                builder.value(choice.doubleValue());
-            if (!choice.stringValue().isEmpty())
-                builder.value(choice.stringValue());
-            convertedChoices.add(builder.build());
-        }
-        return convertedChoices;
-    }
-
    @Override
    public ContextObjectProvider getContextObjectProvider() {
        return this.contextObjectProvider;