Fix option resolving

Author: freya022

src/main/java/com/freya02/botcommands/slash/SlashCommandInfo.java

@@ -16,13 +16,11 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import org.slf4j.Logger;
 
+import javax.annotation.Nonnull;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
+import java.util.*;
 
 public class SlashCommandInfo extends Cooldownable {
 	private static final Logger LOGGER = Logging.getLogger();
@@ -43,6 +41,9 @@ public class SlashCommandInfo extends Cooldownable {
 	private final String path;
 
 	private int pathComponents = 1;
+	
+	/** guild id => localized option names */
+	private final Map<Long, List<String>> localizedOptionMap = new HashMap<>();
 
 	public SlashCommandInfo(SlashCommand slashCommand, Method commandMethod) {
 		super(commandMethod.getAnnotation(JdaSlashCommand.class).cooldownScope(), commandMethod.getAnnotation(JdaSlashCommand.class).cooldown());
@@ -114,6 +115,10 @@ public SlashCommandInfo(SlashCommand slashCommand, Method commandMethod) {
 
 		this.ownerOnly = commandMethod.isAnnotationPresent(RequireOwner.class);
 	}
+	
+	public void putLocalizedOptions(long guildId, @Nonnull List<String> optionNames) {
+		localizedOptionMap.put(guildId, optionNames);
+	}
 
 	public int getPathComponents() {
 		return pathComponents;
@@ -164,14 +169,20 @@ public boolean execute(BContext context, SlashCommandEvent event) {
 				}
 			}};
 
+			final List<String> optionNames = event.getGuild() != null ? localizedOptionMap.get(event.getGuild().getIdLong()) : null;
 			for (int i = 0, commandParametersLength = commandParameters.length; i < commandParametersLength; i++) {
 				SlashCommandParameter parameter = commandParameters[i];
 
-				final OptionMapping optionData = event.getOptions().get(i);
+				String optionName = optionNames == null ? parameter.getEffectiveName() : optionNames.get(i);
+				if (optionName == null) {
+					throw new IllegalArgumentException(String.format("Option name #%d (%s) could not be resolved for %s", i, parameter.getEffectiveName(), getCommandMethod()));
+				}
+				
+				final OptionMapping optionData = event.getOption(optionName);
 
 				if (optionData == null) {
 					if (parameter.isOptional()) {
-						if (parameter.getType().isPrimitive()) {
+						if (parameter.isPrimitive()) {
 							objects.add(0);
 						} else {
 							objects.add(null);

src/main/java/com/freya02/botcommands/slash/SlashCommandParameter.java

@@ -6,7 +6,7 @@
 import com.freya02.botcommands.parameters.SlashParameterResolver;
 
 public class SlashCommandParameter {
-	private final boolean optional;
+	private final boolean optional, primitive;
 	private final String effectiveName;
 	private final SlashParameterResolver resolver;
 	private final Class<?> type;
@@ -15,6 +15,7 @@ public SlashCommandParameter(boolean optional, String effectiveName, Class<?> ty
 		this.optional = optional;
 		this.effectiveName = effectiveName;
 
+		this.primitive = type.isPrimitive();
 		this.type = Utils.getBoxedType(type);
 		ParameterResolver resolver = ParameterResolvers.of(this.type);
 		if (resolver == null) {
@@ -26,6 +27,10 @@ public SlashCommandParameter(boolean optional, String effectiveName, Class<?> ty
 		this.resolver = (SlashParameterResolver) resolver;
 	}
 
+	public boolean isPrimitive() {
+		return primitive;
+	}
+
 	public Class<?> getType() {
 		return type;
 	}

src/main/java/com/freya02/botcommands/slash/SlashCommandsUpdater.java

@@ -142,6 +142,11 @@ private void computeCommands(@NotNull BContextImpl context, @Nullable Guild guil
 					try {
 						final List<String> optionNames = getMethodOptionNames(info);
 						final LocalizedSlashCommandData localizedCommandData = getLocalizedCommandData(guild, info, optionNames);
+						
+						//Put localized option names in order to resolve them when called
+						if (guild != null) {
+							info.putLocalizedOptions(guild.getIdLong(), optionNames);
+						}
 
 						final List<OptionData> methodOptions = getMethodOptions(info, localizedCommandData);