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

add missing checks to Message#suppressEmbeds #1660

Merged
merged 3 commits into from
Jun 27, 2021
Merged

add missing checks to Message#suppressEmbeds #1660

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
205f3c0
add missing checks to Message#suppressEmbeds
sebm253 Jun 11, 2021
2f175ff
Merge branch 'development' into patch/suppress-checks
sebm253 Jun 17, 2021
30b1e22
remove channel variable
sebm253 Jun 27, 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
8 changes: 8 additions & 0 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 @@ -22,6 +22,7 @@
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
import net.dv8tion.jda.api.exceptions.MissingAccessException;
import net.dv8tion.jda.api.exceptions.PermissionException;
import net.dv8tion.jda.api.interactions.InteractionHook;
import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.requests.RestAction;
Expand Down Expand Up @@ -862,6 +863,13 @@ else if (!getGuild().getSelfMember()
@Override
public AuditableRestAction<Void> suppressEmbeds(boolean suppressed)
{
if (!getJDA().getSelfUser().equals(getAuthor()))
{
if (isFromType(ChannelType.PRIVATE))
sebm253 marked this conversation as resolved.
Show resolved Hide resolved
throw new PermissionException("Cannot suppress embeds of others in a PrivateChannel.");
else if (!getGuild().getSelfMember().hasPermission(getTextChannel(), Permission.MESSAGE_MANAGE))
throw new InsufficientPermissionException(getTextChannel(), Permission.MESSAGE_MANAGE);
}
JDAImpl jda = (JDAImpl) getJDA();
Route.CompiledRoute route = Route.Messages.EDIT_MESSAGE.compile(getChannel().getId(), getId());
int newFlags = flags;
Expand Down