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

Adding a check in reaction methods before calling getTextChannel() #1216

Merged
merged 7 commits into from
Apr 4, 2020
Merged

Adding a check in reaction methods before calling getTextChannel() #1216

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e9661f
Added a check everytime getTextChannel() would be called
DManstrator Mar 4, 2020
b6403bb
Throwing the correct Exception now, improved docs of the Message clas…
DManstrator Mar 4, 2020
e4af795
Fixing possible NPEs and adding null-users to the throws section
DManstrator Mar 4, 2020
4e4bb0a
Checking for isFromGuild instead of ChannelType#TEXT
DManstrator Mar 6, 2020
5d2d89f
fixed a typo
DManstrator Mar 6, 2020
076d2e4
Reverted check back to isFromType
DManstrator Mar 6, 2020
52a478b
Moved the comment above the code
DManstrator Apr 2, 2020
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
7 changes: 5 additions & 2 deletions src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,22 +163,23 @@ public RestAction<Void> addReaction(@Nonnull String unicode)
@Override
public RestAction<Void> clearReactions()
{
if (!isFromType(ChannelType.TEXT))
throw new IllegalStateException("Cannot clear reactions from a message in a Group or PrivateChannel.");
DManstrator marked this conversation as resolved.
Show resolved Hide resolved
Checks.check(isFromType(ChannelType.TEXT), "Cannot clear reactions from a message in a Group or PrivateChannel.");
return getTextChannel().clearReactionsById(getId());
}

@Nonnull
@Override
public RestAction<Void> clearReactions(@Nonnull String unicode)
{
Checks.check(isFromType(ChannelType.TEXT), "Cannot clear reactions from a message in a Group or PrivateChannel.");
return getTextChannel().clearReactionsById(getId(), unicode);
}

@Nonnull
@Override
public RestAction<Void> clearReactions(@Nonnull Emote emote)
{
Checks.check(isFromType(ChannelType.TEXT), "Cannot clear reactions from a message in a Group or PrivateChannel.");
return getTextChannel().clearReactionsById(getId(), emote);
}

Expand All @@ -193,6 +194,7 @@ public RestAction<Void> removeReaction(@Nonnull Emote emote)
@Override
public RestAction<Void> removeReaction(@Nonnull Emote emote, @Nonnull User user)
{
Checks.check(isFromType(ChannelType.TEXT), "Cannot remove reactions of others from a message in a Group or PrivateChannel.");
return getTextChannel().removeReactionById(getIdLong(), emote, user);
}

Expand All @@ -207,6 +209,7 @@ public RestAction<Void> removeReaction(@Nonnull String unicode)
@Override
public RestAction<Void> removeReaction(@Nonnull String unicode, @Nonnull User user)
{
Checks.check(isFromType(ChannelType.TEXT), "Cannot remove reactions of others from a message in a Group or PrivateChannel.");
return getTextChannel().removeReactionById(getId(), unicode, user);
}

Expand Down