Upstream
/
DiscordWhitelisterSpigot
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check for role name/ID depending on config

This commit is contained in:
Joe Shimell 2021-03-18 13:58:32 +00:00
parent 0497d2d8c8
commit b19c8b8247
1 changed files with 66 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/uk/co/angrybee/joe/DiscordClient.java
View File

@ -1129,10 +1129,21 @@ public class DiscordClient extends ListenerAdapter
// Check if removed roles contain a limited-add role // Check if removed roles contain a limited-add role
for(Role role:removedRoles) for(Role role:removedRoles)
{ {
if(Arrays.asList(allowedToAddLimitedRoles).contains(role.getName())) if(DiscordWhitelister.useIdForRoles)
{ {
limitedRoleRemoved = true; if(Arrays.asList(allowedToAddLimitedRoles).contains(role.getId()))
break; {
limitedRoleRemoved = true;
break;
}
}
else
{
if(Arrays.asList(allowedToAddLimitedRoles).contains(role.getName()))
{
limitedRoleRemoved = true;
break;
}
} }
} }
@ -1149,10 +1160,21 @@ public class DiscordClient extends ListenerAdapter
List<Role> roles = member.getRoles(); List<Role> roles = member.getRoles();
for(Role role:roles) for(Role role:roles)
{ {
if(Arrays.asList(combinedRoles).contains(role.getName())) if(DiscordWhitelister.useIdForRoles)
{ {
rolesRemaining = true; if(Arrays.asList(combinedRoles).contains(role.getId()))
break; {
rolesRemaining = true;
break;
}
}
else
{
if(Arrays.asList(combinedRoles).contains(role.getName()))
{
rolesRemaining = true;
break;
}
} }
} }
} }
@ -1201,8 +1223,16 @@ public class DiscordClient extends ListenerAdapter
for(Role r : e.getMember().getRoles()) for(Role r : e.getMember().getRoles())
{ {
// required role found, no need to proceed // required role found, no need to proceed
if(r.getName().equals(roleToCheck)) if(DiscordWhitelister.useIdForRoles)
return; {
if(r.getId().equals(roleToCheck))
return;
}
else
{
if(r.getName().equals(roleToCheck))
return;
}
} }
DiscordWhitelister.getPluginLogger().info(nameForLogger + " does not have the required " + DiscordWhitelister.getPluginLogger().info(nameForLogger + " does not have the required " +
@ -1287,10 +1317,21 @@ public class DiscordClient extends ListenerAdapter
List<Role> roles = member.getRoles(); List<Role> roles = member.getRoles();
for (Role role : roles) for (Role role : roles)
{ {
if (Arrays.asList(combinedRoles).contains(role.getName())) if(DiscordWhitelister.useIdForRoles)
{ {
rolesRemaining = true; if (Arrays.asList(combinedRoles).contains(role.getId()))
break; {
rolesRemaining = true;
break;
}
}
else
{
if (Arrays.asList(combinedRoles).contains(role.getName()))
{
rolesRemaining = true;
break;
}
} }
} }
} }
@ -1359,10 +1400,21 @@ public class DiscordClient extends ListenerAdapter
{ {
for (Role role : member.getRoles()) for (Role role : member.getRoles())
{ {
if (role.getName().equals(roleToCheck)) if(DiscordWhitelister.useIdForRoles)
{ {
requiredRole = true; if (role.getId().equals(roleToCheck))
break; {
requiredRole = true;
break;
}
}
else
{
if (role.getName().equals(roleToCheck))
{
requiredRole = true;
break;
}
} }
} }
} }