Skip to content

Prevent role snowflakes from resolving roles with ids as names #4983

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

Merged
mdcfe merged 1 commit into from
Jul 9, 2022
Merged

Prevent role snowflakes from resolving roles with ids as names #4983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/utils/NumberUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ public static boolean isPositiveInt(final String sInt) {
return Integer.parseInt(sInt) > 0;
}

public static boolean isNumeric(final String sNum) {
for (final char sChar : sNum.toCharArray()) {
if (!Character.isDigit(sChar)) {
return false;
}
}
return true;
}

/**
* Backport from Guava.
*/
Expand Down
4 changes: 3 additions & 1 deletion EssentialsDiscord/src/main/java/net/essentialsx/discord/util/DiscordUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import club.minnced.discord.webhook.send.AllowedMentions;
import com.earth2me.essentials.utils.DownsampleUtil;
import com.earth2me.essentials.utils.FormatUtil;
import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableList;
import net.dv8tion.jda.api.Permission;
Expand Down Expand Up @@ -181,13 +182,14 @@ public static boolean hasRoles(Member member, List<String> roleDefinitions) {
final List<Role> roles = member.getRoles();
for (String roleDefinition : roleDefinitions) {
roleDefinition = roleDefinition.trim();
final boolean id = NumberUtil.isNumeric(roleDefinition);

if (roleDefinition.equals("*") || member.getId().equals(roleDefinition)) {
return true;
}

for (final Role role : roles) {
if (role.getId().equals(roleDefinition) || role.getName().equalsIgnoreCase(roleDefinition)) {
if (role.getId().equals(roleDefinition) || (!id && role.getName().equalsIgnoreCase(roleDefinition))) {
return true;
}
}
Expand Down