funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-06-13 19:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Users optional arguments (#139)

Browse Source 
This PR allows `User`s to be optional command arguments similar to how the annotation operates on Bukkit's `Player`.
This commit is contained in:
simpleauthority
2018-07-24 18:42:54 -07:00
committed by Daniel Ennis
parent e181a2fabe
commit 7a2e547766
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jda/src/main/java/co/aikar/commands/JDACommandContexts.java
+6 -2
View File
@@ -32,7 +32,7 @@ public class JDACommandContexts extends CommandContexts<JDACommandExecutionConte
this.registerIssuerOnlyContext(JDA.class, c -> jda);
this.registerIssuerOnlyContext(Guild.class, c -> {
MessageReceivedEvent event = c.getIssuer().getIssuer();
if (event.isFromType(ChannelType.PRIVATE) && !c.hasAnnotation(Optional.class)) {
if (event.isFromType(ChannelType.PRIVATE) && !c.isOptional()) {
throw new InvalidCommandArgument("This command can only be executed in a Guild.", false);
} else {
return event.getGuild();
@@ -66,7 +66,11 @@ public class JDACommandContexts extends CommandContexts<JDACommandExecutionConte
if (c.hasAnnotation(SelfUser.class)) {
return jda.getSelfUser();
}
String arg = c.popFirstArg(); // we pop because we are only issuer aware if we are annotated
String arg = c.getFirstArg();
if (c.isOptional() && (arg == null || arg.isEmpty())) {
return null;
}
arg = c.popFirstArg(); // we pop because we are only issuer aware if we are annotated
User user = null;
if (arg.startsWith("<@!")) { // for some reason a ! is added when @'ing and clicking their name.
user = jda.getUserById(arg.substring(3, arg.length() - 1));