Fashionscape/discord-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed forced lowercase on command args

Browse Source
This commit is contained in:
Aleksei 2020-02-27 18:22:13 -05:00
parent b68277d5b5
commit a4df63a2cd
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/dev/salmonllama/fsbot/guthix/Guthix.java
View File

@ -13,10 +13,7 @@ import dev.salmonllama.fsbot.commands.developer.CreateGalleryCommand;
import dev.salmonllama.fsbot.commands.developer.EvalCommand; import dev.salmonllama.fsbot.commands.developer.EvalCommand;
import dev.salmonllama.fsbot.utilities.database.DatabaseUtilities; import dev.salmonllama.fsbot.utilities.database.DatabaseUtilities;
import org.javacord.api.DiscordApi; import org.javacord.api.DiscordApi;
import org.javacord.api.entity.channel.TextChannel;
import org.javacord.api.entity.message.Message;
import org.javacord.api.entity.message.MessageAuthor; import org.javacord.api.entity.message.MessageAuthor;
import org.javacord.api.entity.server.Server;
import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.event.message.MessageCreateEvent;
import org.javacord.api.listener.message.MessageCreateListener; import org.javacord.api.listener.message.MessageCreateListener;
import dev.salmonllama.fsbot.commands.developer.TestCommand; import dev.salmonllama.fsbot.commands.developer.TestCommand;
@ -70,7 +67,6 @@ public class Guthix implements MessageCreateListener {
addCommand(new ColorCommand()); addCommand(new ColorCommand());
addCommand(new ColorsCommand()); addCommand(new ColorsCommand());
addCommand(new OutfitCommand()); addCommand(new OutfitCommand());
addCommand(new SpecificOutfitCommand(db));
addCommand(new HelpCommand(this)); addCommand(new HelpCommand(this));
} }
@ -97,16 +93,17 @@ public class Guthix implements MessageCreateListener {
return; return;
} }
String content = event.getMessageContent().toLowerCase(); String content = event.getMessageContent();
String contentLower = content.toLowerCase();
if (registry.startsWithPrefix(content)) { if (registry.startsWithPrefix(contentLower)) {
} else { } else {
return; return;
} }
RegistryCommand rComm = registry.getCommandInfo(content); RegistryCommand rComm = registry.getCommandInfo(content);
String cmdString = rComm.getCommand(); String cmdString = rComm.getCommand().toLowerCase();
if (registry.isCommandAlias(cmdString)) { if (registry.isCommandAlias(cmdString)) {
@ -114,9 +111,6 @@ public class Guthix implements MessageCreateListener {
return; return;
} }
Message msg = event.getMessage();
TextChannel channel = event.getChannel();
Server server = event.getServer().orElse(null);
String[] cmdArgs = rComm.getArgs(); String[] cmdArgs = rComm.getArgs();
Command cmd = registry.findCommand(cmdString).orElse(null); // TODO: default command here Command cmd = registry.findCommand(cmdString).orElse(null); // TODO: default command here