zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

JDA channel argument parsing improvements.

Browse source 
- Ensure that the parsing modes list cannot be empty when constructing `MessageParser`
- Don't proceed if the command context does not have the message event stored
- Don't proceed if the message was not sent in a guild
- Remove `|| modes.size() == 1` check in channel mention parsing
This commit is contained in:
p5nbTgip0r 2021-01-05 02:28:03 -08:00 • committed by Alexander Söderberg
parent 3a047c1ce0
commit 2723ec13f9
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/ChannelArgument.java
View file

@ -147,8 +147,13 @@ public final class ChannelArgument<C> extends CommandArgument<C, MessageChannel>
* Construct a new argument parser for {@link MessageChannel}
*
* @param modes List of parsing modes to use when parsing
* @throws java.lang.IllegalStateException If no parsing modes were provided
*/
public MessageParser(final @NonNull Set<ParserMode> modes) {
if (modes.isEmpty()) {
throw new IllegalArgumentException("At least one parsing mode is required");
}
this.modes = modes;
}
@ -165,11 +170,21 @@ public final class ChannelArgument<C> extends CommandArgument<C, MessageChannel>
));
}
if (!commandContext.contains("MessageReceivedEvent")) {
return ArgumentParseResult.failure(new IllegalStateException(
"MessageReceivedEvent was not in the command context."
));
}
final MessageReceivedEvent event = commandContext.get("MessageReceivedEvent");
Exception exception = null;
if (!event.isFromGuild()) {
return ArgumentParseResult.failure(new IllegalArgumentException("Channel arguments can only be parsed in guilds"));
}
if (modes.contains(ParserMode.MENTION)) {
if (input.startsWith("<#") || modes.size() == 1) {
if (input.startsWith("<#") && input.endsWith(">")) {
final String id = input.substring(2, input.length() - 1);
try {
@ -179,6 +194,10 @@ public final class ChannelArgument<C> extends CommandArgument<C, MessageChannel>
} catch (final ChannelNotFoundException | NumberFormatException e) {
exception = e;
}
} else {
exception = new IllegalArgumentException(
String.format("Input '%s' is not a channel mention.", input)
);
}
}