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

Add "always respect user permissions" field #91

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Add "always respect user permissions" field #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5712515
add alwaysRespectUserPermission option to interactions
Chew Aug 26, 2024
62cd50f
address review, these names are better
Chew Jan 8, 2025
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
10 changes: 10 additions & 0 deletions command/src/main/java/com/jagrosh/jdautilities/command/ContextMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,16 @@ public Map<DiscordLocale, String> getNameLocalization() {
return nameLocalization;
}

/**
* {@code true} if the command should always respect {@link #userPermissions}, even if the server overrides them,
* {@code false} if the command should ignore {@link #userPermissions} if the server overrides them.
* <br>
* This defaults to false because it interferes with the server's options for interactions.
* <br>
* This has no effect for text based commands or DMs.
*/
protected boolean forceUserPermissions = false;

/**
* Gets the type of context menu.
*
Expand Down
33 changes: 18 additions & 15 deletions command/src/main/java/com/jagrosh/jdautilities/command/MessageContextMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,29 @@ public final void run(MessageContextMenuEvent event)
if(event.isFromGuild())
{
//user perms
for(Permission p: userPermissions)
if (forceUserPermissions)
{
// Member will never be null because this is only ran in a server (text channel)
if(event.getMember() == null)
continue;

if(p.isChannel())
for(Permission p: userPermissions)
{
if(!event.getMember().hasPermission(event.getGuildChannel(), p))
// Member will never be null because this is only ran in a server (text channel)
if(event.getMember() == null)
continue;

if(p.isChannel())
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "channel"));
return;
if(!event.getMember().hasPermission(event.getGuildChannel(), p))
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "channel"));
return;
}
}
}
else
{
if(!event.getMember().hasPermission(p))
else
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "server"));
return;
if(!event.getMember().hasPermission(p))
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "server"));
return;
}
}
}
}
Expand Down
43 changes: 28 additions & 15 deletions command/src/main/java/com/jagrosh/jdautilities/command/SlashCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,16 @@ public abstract class SlashCommand extends Command
@Deprecated
protected String requiredRole = null;

/**
* {@code true} if the command should always respect {@link #userPermissions}, even if the server overrides them,
* {@code false} if the command should ignore {@link #userPermissions} if the server overrides them.
* <br>
* This defaults to false because it interferes with the server's options for interactions.
* <br>
* This has no effect for text based commands or DMs.
*/
protected boolean forceUserPermissions = false;

/**
* The child commands of the command. These are used in the format {@code /<parent name>
* <child name>}.
Expand Down Expand Up @@ -221,26 +231,29 @@ public final void run(SlashCommandEvent event)
if(event.getChannelType() != ChannelType.PRIVATE)
{
//user perms
for(Permission p: userPermissions)
if (forceUserPermissions)
{
// Member will never be null because this is only ran in a server (text channel)
if(event.getMember() == null)
continue;

if(p.isChannel())
for(Permission p: userPermissions)
{
if(!event.getMember().hasPermission(event.getGuildChannel(), p))
// Member will never be null because this is only ran in a server (text channel)
if(event.getMember() == null)
continue;

if(p.isChannel())
{
terminate(event, String.format(userMissingPermMessage, client.getError(), p.getName(), "channel"), client);
return;
if(!event.getMember().hasPermission(event.getGuildChannel(), p))
{
terminate(event, String.format(userMissingPermMessage, client.getError(), p.getName(), "channel"), client);
return;
}
}
}
else
{
if(!event.getMember().hasPermission(p))
else
{
terminate(event, String.format(userMissingPermMessage, client.getError(), p.getName(), "server"), client);
return;
if(!event.getMember().hasPermission(p))
{
terminate(event, String.format(userMissingPermMessage, client.getError(), p.getName(), "server"), client);
return;
}
}
}
}
Expand Down
33 changes: 18 additions & 15 deletions command/src/main/java/com/jagrosh/jdautilities/command/UserContextMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,29 @@ public final void run(UserContextMenuEvent event)
if(event.isFromGuild())
{
//user perms
for(Permission p: userPermissions)
if (forceUserPermissions)
{
// Member will never be null because this is only ran in a server
if(event.getMember() == null)
continue;

if(p.isChannel())
for(Permission p: userPermissions)
{
if(!event.getMember().hasPermission(event.getGuildChannel(), p))
// Member will never be null because this is only ran in a server
if(event.getMember() == null)
continue;

if(p.isChannel())
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "channel"));
return;
if(!event.getMember().hasPermission(event.getGuildChannel(), p))
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "channel"));
return;
}
}
}
else
{
if(!event.getMember().hasPermission(p))
else
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "server"));
return;
if(!event.getMember().hasPermission(p))
{
terminate(event, String.format("%s%s%s", event.getClient().getError(), p.getName(), "server"));
return;
}
}
}
}
Expand Down
Loading