Merge pull request #56 from Xyntexx/feature/slashcommands

Feature/slashcommands
Shimell · Jul 27, 2021 · a425172 · a425172
2 parents 9908407 + 4e843db
commit a425172
Show file tree

Hide file tree

Showing 16 changed files with 1,844 additions and 1,539 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
  <groupId>uk.co.angrybee.joe</groupId>
  <artifactId>discord-whitelister</artifactId>
- <version>1.4.8</version>
+ <version>1.4.9</version>
 
  <name>discord-whitelister</name>
  <url>https://github.com/JoeShimell/DiscordWhitelisterSpigot</url>
@@ -49,7 +49,7 @@
  <dependency>
  <groupId>org.spigotmc</groupId>
  <artifactId>spigot-api</artifactId>
- <version>1.17-R0.1-SNAPSHOT</version>
+ <version>1.17.1-R0.1-SNAPSHOT</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/src/main/java/uk/co/angrybee/joe/AuthorPermissions.java b/src/main/java/uk/co/angrybee/joe/AuthorPermissions.java
@@ -1,6 +1,7 @@
 package uk.co.angrybee.joe;
 
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.util.Arrays;
@@ -13,6 +14,111 @@ public class AuthorPermissions
  private boolean userIsBanned = false;
  private boolean userCanUseClear = false;
 
+ public AuthorPermissions(SlashCommandEvent event) {
+ for (Role role : event.getMember().getRoles())
+ {
+ if(!DiscordWhitelister.useIdForRoles)
+ {
+ if (Arrays.stream(DiscordClient.allowedToAddRemoveRoles).parallel().anyMatch(role.getName()::equalsIgnoreCase))
+ {
+ userCanAddRemove = true;
+ break;
+ }
+ }
+ else
+ {
+ if (Arrays.stream(DiscordClient.allowedToAddRemoveRoles).parallel().anyMatch(role.getId()::equalsIgnoreCase))
+ {
+ userCanAddRemove = true;
+ break;
+ }
+ }
+ }
+
+ for (Role role : event.getGuild().getMember(event.getUser()).getRoles())
+ {
+ if (!DiscordWhitelister.useIdForRoles)
+ {
+ if (Arrays.stream(DiscordClient.allowedToAddRoles).parallel().anyMatch(role.getName()::equalsIgnoreCase))
+ {
+ userCanAdd = true;
+ break;
+ }
+ }
+ else
+ {
+ if (Arrays.stream(DiscordClient.allowedToAddRoles).parallel().anyMatch(role.getId()::equalsIgnoreCase))
+ {
+ userCanAdd = true;
+ break;
+ }
+ }
+ }
+
+ for (Role role : event.getGuild().getMember(event.getUser()).getRoles())
+ {
+ if(!DiscordWhitelister.useIdForRoles)
+ {
+ if (Arrays.stream(DiscordClient.allowedToAddLimitedRoles).parallel().anyMatch(role.getName()::equalsIgnoreCase))
+ {
+ userHasLimitedAdd = true;
+ break;
+ }
+ }
+ else
+ {
+ if (Arrays.stream(DiscordClient.allowedToAddLimitedRoles).parallel().anyMatch(role.getId()::equalsIgnoreCase))
+ {
+ userHasLimitedAdd = true;
+ break;
+ }
+ }
+ }
+
+ if(DiscordWhitelister.useOnBanEvents)
+ {
+ for(Role role : event.getGuild().getMember(event.getUser()).getRoles())
+ {
+ if(!DiscordWhitelister.useIdForRoles)
+ {
+ if (Arrays.stream(DiscordWhitelister.bannedRoles).parallel().anyMatch(role.getName()::equalsIgnoreCase))
+ {
+ userIsBanned = true;
+ break;
+ }
+ }
+ else
+ {
+ if (Arrays.stream(DiscordWhitelister.bannedRoles).parallel().anyMatch(role.getId()::equalsIgnoreCase))
+ {
+ userIsBanned = true;
+ break;
+ }
+ }
+ }
+ }
+
+ for(Role role : event.getGuild().getMember(event.getUser()).getRoles())
+ {
+ if(!DiscordWhitelister.useIdForRoles)
+ {
+ if(Arrays.stream(DiscordClient.allowedToClearNamesRoles).parallel().anyMatch(role.getName()::equalsIgnoreCase))
+ {
+ userCanUseClear = true;
+ break;
+ }
+ }
+ else
+ {
+ if(Arrays.stream(DiscordClient.allowedToClearNamesRoles).parallel().anyMatch(role.getId()::equalsIgnoreCase))
+ {
+ userCanUseClear = true;
+ break;
+ }
+ }
+ }
+ }
+
  public boolean isUserCanAddRemove() {
  return userCanAddRemove;
  }