github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix requireRole attribute of interaction service (#1980)

Browse Source
This commit is contained in:
Cenk Ergen
2021-12-20 19:41:55 +03:00
committed by GitHub
parent 5d43fe65b4
commit a2f57f8cc6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Discord.Net.Interactions/Attributes/Preconditions/RequireRoleAttribute.cs
View File

@@ -54,15 +54,17 @@ namespace Discord.Interactions
if (guildUser.RoleIds.Contains(RoleId.Value)) if (guildUser.RoleIds.Contains(RoleId.Value))
return Task.FromResult(PreconditionResult.FromSuccess()); return Task.FromResult(PreconditionResult.FromSuccess());
else else
Task.FromResult(PreconditionResult.FromError(ErrorMessage ?? $"User requires guild role {context.Guild.GetRole(RoleId.Value).Name}.")); return Task.FromResult(PreconditionResult.FromError(ErrorMessage ?? $"User requires guild role {context.Guild.GetRole(RoleId.Value).Name}."));
} }
if (!string.IsNullOrEmpty(RoleName)) if (!string.IsNullOrEmpty(RoleName))
{ {
if (guildUser.Guild.Roles.Any(x => x.Name == RoleName)) var roleNames = guildUser.RoleIds.Select(x => guildUser.Guild.GetRole(x).Name);
if (roleNames.Contains(RoleName))
return Task.FromResult(PreconditionResult.FromSuccess()); return Task.FromResult(PreconditionResult.FromSuccess());
else else
Task.FromResult(PreconditionResult.FromError(ErrorMessage ?? $"User requires guild role {RoleName}.")); return Task.FromResult(PreconditionResult.FromError(ErrorMessage ?? $"User requires guild role {RoleName}."));
} }
return Task.FromResult(PreconditionResult.FromSuccess()); return Task.FromResult(PreconditionResult.FromSuccess());