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

JDA: Guild isolation for user argument

Browse source
This commit is contained in:
p5nbTgip0r 2021-01-25 17:22:58 -08:00 • committed by Jason
parent 775cf803fa
commit 80ad84f2e8
2 changed files with 70 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandManager.java
View file

@ -107,7 +107,8 @@ public class JDACommandManager<C> extends CommandManager<C> {
/* Register JDA Parsers */ /* Register JDA Parsers */
this.getParserRegistry().registerParserSupplier(TypeToken.get(User.class), parserParameters -> this.getParserRegistry().registerParserSupplier(TypeToken.get(User.class), parserParameters ->
new UserArgument.UserParser<>( new UserArgument.UserParser<>(
new HashSet<>(Arrays.asList(UserArgument.ParserMode.values())) new HashSet<>(Arrays.asList(UserArgument.ParserMode.values())),
UserArgument.Isolation.GUILD
)); ));
this.getParserRegistry().registerParserSupplier(TypeToken.get(MessageChannel.class), parserParameters -> this.getParserRegistry().registerParserSupplier(TypeToken.get(MessageChannel.class), parserParameters ->
new ChannelArgument.MessageParser<>( new ChannelArgument.MessageParser<>(

80
cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/parsers/UserArgument.java
View file

@ -28,15 +28,18 @@ import cloud.commandframework.arguments.parser.ArgumentParseResult;
import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.parser.ArgumentParser;
import cloud.commandframework.context.CommandContext; import cloud.commandframework.context.CommandContext;
import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Queue; import java.util.Queue;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
/** /**
* Command Argument for {@link User} * Command Argument for {@link User}
@ -48,13 +51,16 @@ import java.util.Set;
public final class UserArgument<C> extends CommandArgument<C, User> { public final class UserArgument<C> extends CommandArgument<C, User> {
private final Set<ParserMode> modes; private final Set<ParserMode> modes;
private final Isolation isolationLevel;
private UserArgument( private UserArgument(
final boolean required, final @NonNull String name, final boolean required, final @NonNull String name,
final @NonNull Set<ParserMode> modes final @NonNull Set<ParserMode> modes,
final @NonNull Isolation isolationLevel
) { ) {
super(required, name, new UserParser<>(modes), User.class); super(required, name, new UserParser<>(modes, isolationLevel), User.class);
this.modes = modes; this.modes = modes;
this.isolationLevel = isolationLevel;
} }
/** /**
@ -106,10 +112,16 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
NAME NAME
} }
public enum Isolation {
GLOBAL,
GUILD
}
public static final class Builder<C> extends CommandArgument.Builder<C, User> { public static final class Builder<C> extends CommandArgument.Builder<C, User> {
private Set<ParserMode> modes = new HashSet<>(); private Set<ParserMode> modes = new HashSet<>();
private Isolation isolationLevel = Isolation.GUILD;
private Builder(final @NonNull String name) { private Builder(final @NonNull String name) {
super(User.class, name); super(User.class, name);
@ -137,6 +149,17 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
return this; return this;
} }
/**
* Set the isolation level of the parser
*
* @param isolation Isolation level
* @return Builder instance
*/
public @NonNull Builder<C> withIsolationLevel(final @NonNull Isolation isolation) {
this.isolationLevel = isolation;
return this;
}
/** /**
* Builder a new example component * Builder a new example component
* *
@ -144,7 +167,7 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
*/ */
@Override @Override
public @NonNull UserArgument<C> build() { public @NonNull UserArgument<C> build() {
return new UserArgument<>(this.isRequired(), this.getName(), modes); return new UserArgument<>(this.isRequired(), this.getName(), modes, isolationLevel);
} }
} }
@ -153,19 +176,22 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
public static final class UserParser<C> implements ArgumentParser<C, User> { public static final class UserParser<C> implements ArgumentParser<C, User> {
private final Set<ParserMode> modes; private final Set<ParserMode> modes;
private final Isolation isolationLevel;
/** /**
* Construct a new argument parser for {@link User} * Construct a new argument parser for {@link User}
* *
* @param modes List of parsing modes to use when parsing * @param modes List of parsing modes to use when parsing
* @throws java.lang.IllegalStateException If no parsing modes were provided * @param isolationLevel Level of isolation to maintain when parsing
* @throws java.lang.IllegalArgumentException If no parsing modes were provided
*/ */
public UserParser(final @NonNull Set<ParserMode> modes) { public UserParser(final @NonNull Set<ParserMode> modes, final @NonNull Isolation isolationLevel) {
if (modes.isEmpty()) { if (modes.isEmpty()) {
throw new IllegalArgumentException("At least one parsing mode is required"); throw new IllegalArgumentException("At least one parsing mode is required");
} }
this.modes = modes; this.modes = modes;
this.isolationLevel = isolationLevel;
} }
@Override @Override
@ -181,7 +207,13 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
)); ));
} }
final JDA jda = commandContext.get("JDA"); 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; Exception exception = null;
if (modes.contains(ParserMode.MENTION)) { if (modes.contains(ParserMode.MENTION)) {
@ -194,7 +226,7 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
} }
try { try {
final ArgumentParseResult<User> result = this.userFromId(jda, input, id); final ArgumentParseResult<User> result = this.userFromId(event, input, id);
inputQueue.remove(); inputQueue.remove();
return result; return result;
} catch (final UserNotFoundParseException | NumberFormatException e) { } catch (final UserNotFoundParseException | NumberFormatException e) {
@ -209,7 +241,7 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
if (modes.contains(ParserMode.ID)) { if (modes.contains(ParserMode.ID)) {
try { try {
final ArgumentParseResult<User> result = this.userFromId(jda, input, input); final ArgumentParseResult<User> result = this.userFromId(event, input, input);
inputQueue.remove(); inputQueue.remove();
return result; return result;
} catch (final UserNotFoundParseException | NumberFormatException e) { } catch (final UserNotFoundParseException | NumberFormatException e) {
@ -218,7 +250,19 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
} }
if (modes.contains(ParserMode.NAME)) { if (modes.contains(ParserMode.NAME)) {
final List<User> users = jda.getUsersByName(input, true); final List<User> users;
if (isolationLevel == Isolation.GLOBAL) {
users = event.getJDA().getUsersByName(input, true);
} else if (event.isFromGuild()) {
users = event.getGuild().getMembersByEffectiveName(input, true)
.stream().map(Member::getUser)
.collect(Collectors.toList());
} else if (event.getAuthor().getName().equalsIgnoreCase(input)) {
users = Collections.singletonList(event.getAuthor());
} else {
users = Collections.emptyList();
}
if (users.size() == 0) { if (users.size() == 0) {
exception = new UserNotFoundParseException(input); exception = new UserNotFoundParseException(input);
@ -240,11 +284,23 @@ public final class UserArgument<C> extends CommandArgument<C, User> {
} }
private @NonNull ArgumentParseResult<User> userFromId( private @NonNull ArgumentParseResult<User> userFromId(
final @NonNull JDA jda, final @NonNull String input, final @NonNull MessageReceivedEvent event,
final @NonNull String input,
final @NonNull String id final @NonNull String id
) )
throws UserNotFoundParseException, NumberFormatException { throws UserNotFoundParseException, NumberFormatException {
final User user = jda.getUserById(id); final User user;
if (isolationLevel == Isolation.GLOBAL) {
user = event.getJDA().getUserById(id);
} else if (event.isFromGuild()) {
Member member = event.getGuild().getMemberById(id);
user = member != null ? member.getUser() : null;
} else if (event.getAuthor().getId().equalsIgnoreCase(id)) {
user = event.getAuthor();
} else {
user = null;
}
if (user == null) { if (user == null) {
throw new UserNotFoundParseException(input); throw new UserNotFoundParseException(input);