Merge branch 'master' into experimental/jda-lts

src/main/java/com/awakenedredstone/autowhitelist/config/ConfigData.java

@@ -12,5 +12,6 @@ public class ConfigData {
     public String token;
     public String clientId;
     public String discordServerId;
+    public boolean enableSlashCommands;
     public Map<String, List<String>> whitelist;
 }

src/main/java/com/awakenedredstone/autowhitelist/discord/Bot.java

@@ -106,6 +106,8 @@ public class Bot implements Runnable {
             try {
                 jda.getPresence().setActivity(Activity.of(Activity.ActivityType.valueOf(new TranslatableText("bot.activity.type").getString().toUpperCase().replace("PLAYING", "DEFAULT")), new TranslatableText("bot.activity.message").getString()));
             } catch (IllegalArgumentException | NullPointerException e) { //TODO: remove the replace once JDA is updated to 5.x.x
+                jda.getPresence().setActivity(Activity.of(Activity.ActivityType.valueOf(new TranslatableText("bot.activity.type").getString().toUpperCase()), new TranslatableText("bot.activity.message").getString()));
+            } catch (IllegalArgumentException | NullPointerException e) {
                 AutoWhitelist.LOGGER.error("Failed to set bot activity, the chosen activity type value is not valid.", e);
             }
             TestCommand.register(AutoWhitelistAPI.dispatcher());

src/main/java/com/awakenedredstone/autowhitelist/discord/api/command/CommandManager.java

@@ -54,11 +54,6 @@ public class CommandManager {
                 return var18;
             } catch (CommandSyntaxException var14) {
                 if (var14.getInput() != null && var14.getCursor() >= 0) {
-                    ParseResults<DiscordCommandSource> parse = dispatcher.parse(stringReader, commandSource);
-                    CommandContext<DiscordCommandSource> context = parse.getContext().build(parse.getReader().getString());
-                    if (context.getChild() == null && context.getCommand() == null) {
-
-                    }
                     int i = Math.min(var14.getInput().length(), var14.getCursor());
                     MutableText mutableText = Util.toText(var14.getRawMessage()).shallowCopy();
                     mutableText.append("\n");