Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix IllegalStateException for OptionType.MENTIONABLE #1964

Merged
merged 3 commits into from
Dec 24, 2021
Merged

Fix IllegalStateException for OptionType.MENTIONABLE #1964

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
851543e
fix IllegalStateException for OptionType.MENTIONABLE
averen Dec 22, 2021
2f63016
check for MENTIONABLE in getAsMember too
averen Dec 22, 2021
3d1cd24
update docs
averen Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,14 @@ public IMentionable getAsMentionable()
* <br>Note that {@link OptionType#USER OptionType.USER} can also accept users that are not members of a guild, in which case this will be null!
*
* @throws IllegalStateException
* If this option is not of type {@link OptionType#USER USER}
* If this option is not of type {@link OptionType#USER USER} or {@link OptionType#MENTIONABLE MENTIONABLE}
*
* @return The resolved {@link Member}, or null
*/
@Nullable
public Member getAsMember()
{
if (type != OptionType.USER)
if (type != OptionType.USER && type != OptionType.MENTIONABLE)
throw new IllegalStateException("Cannot resolve Member for option " + getName() + " of type " + type);
Object object = resolved.get(getAsLong());
if (object instanceof Member)
Expand All @@ -189,40 +189,42 @@ public Member getAsMember()
* The resolved {@link User} for this option value.
*
* @throws IllegalStateException
* If this option is not of type {@link OptionType#USER USER}
* If this option is not of type {@link OptionType#USER USER} or
* {@link OptionType#MENTIONABLE MENTIONABLE} without a resolved user
*
* @return The resolved {@link User}
*/
@Nonnull
public User getAsUser()
{
if (type != OptionType.USER)
if (type != OptionType.USER && type != OptionType.MENTIONABLE)
throw new IllegalStateException("Cannot resolve User for option " + getName() + " of type " + type);
Object object = resolved.get(getAsLong());
if (object instanceof Member)
return ((Member) object).getUser();
if (object instanceof User)
return (User) object;
throw new IllegalStateException("Could not resolve user!");
throw new IllegalStateException("Could not resolve User from option type " + type);
}

/**
* The resolved {@link Role} for this option value.
*
* @throws IllegalStateException
* If this option is not of type {@link OptionType#ROLE ROLE}
* If this option is not of type {@link OptionType#ROLE ROLE} or
* {@link OptionType#MENTIONABLE MENTIONABLE} without a resolved role
*
* @return The resolved {@link Role}
*/
@Nonnull
public Role getAsRole()
{
if (type != OptionType.ROLE)
if (type != OptionType.ROLE && type != OptionType.MENTIONABLE)
throw new IllegalStateException("Cannot resolve Role for option " + getName() + " of type " + type);
Object role = resolved.get(getAsLong());
if (role instanceof Role)
return (Role) role;
throw new IllegalStateException("Could not resolve role!");
throw new IllegalStateException("Could not resolve Role from option type " + type);
}

/**
Expand Down