Merge pull request #445 from danthe1st/config-no-botadmin

fix breaking Discord API change affecting /config autocomplete

Author: MoonTM-GIT

src/main/java/net/javadiscord/javabot/data/config/ReflectionUtils.java

@@ -54,7 +54,7 @@ public static Optional<Pair<Field, Object>> resolveField(@NotNull String propert
 	public static @Nullable Pair<Field, Object> resolveField(@NotNull String[] fieldNames, @NotNull Object parent) throws UnknownPropertyException {
 		if (fieldNames.length == 0) return null;
 		try {
-			Field field = parent.getClass().getDeclaredField(fieldNames[0]);
+			Field field = findDeclaredField(parent.getClass(), fieldNames[0]);
 			// Transient fields should not exist in the context of property resolution, treat them as unknown.
 			if (Modifier.isTransient(field.getModifiers())) {
 				throw new UnknownPropertyException(fieldNames[0], parent.getClass());
@@ -77,6 +77,19 @@ public static Optional<Pair<Field, Object>> resolveField(@NotNull String propert
 		}
 	}
 
+	private static Field findDeclaredField(Class<?> cl, String name) throws NoSuchFieldException {
+		try {
+			return cl.getDeclaredField(name);
+		} catch (NoSuchFieldException e) {
+			for (Field field : cl.getDeclaredFields()) {
+				if(field.getName().equalsIgnoreCase(name)) {
+					return field;
+				}
+			}
+			throw e;
+		}
+	}
+
 	/**
 	 * Gets a mapping of properties and their type, recursively for the given
 	 * type.

src/main/java/net/javadiscord/javabot/systems/configuration/ConfigCommand.java

@@ -17,10 +17,9 @@ public class ConfigCommand extends SlashCommand implements CommandModerationPerm
 	 * @param getConfigSubcommand /config get
 	 * @param setConfigSubcommand /config set
 	 */
-	public ConfigCommand(BotConfig botConfig, ExportConfigSubcommand exportConfigSubcommand, GetConfigSubcommand getConfigSubcommand, ConfigSubcommand setConfigSubcommand) {
+	public ConfigCommand(BotConfig botConfig, ExportConfigSubcommand exportConfigSubcommand, GetConfigSubcommand getConfigSubcommand, SetConfigSubcommand setConfigSubcommand) {
 		setModerationSlashCommandData(Commands.slash("config", "Administrative Commands for managing the bot's configuration."));
 		addSubcommands(exportConfigSubcommand, getConfigSubcommand, setConfigSubcommand);
-		setRequiredUsers(botConfig.getSystems().getAdminConfig().getAdminUsers());
 	}
 }