-
-
Notifications
You must be signed in to change notification settings - Fork 735
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature] Parameter precondition attribute for simplifying performing…
… hierarchical operations within a guild (#2906) * Support interaction framework and update bundled preconditions docs * Support text commands and update bundled preconditions docs * Fix example * Move hierarchy util to `PermissionUtils` * Refactoring
- Loading branch information
Showing
5 changed files
with
130 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/Discord.Net.Commands/Attributes/Preconditions/DoHierarchyCheckAttribute.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
using System; | ||
using System.Threading.Tasks; | ||
|
||
namespace Discord.Commands | ||
{ | ||
/// <summary> | ||
/// Ensures that command parameters are passed within a correct hierarchical context. | ||
/// </summary> | ||
/// <remarks> | ||
/// Useful for performing hierarchical operations within a guild, such as managing roles or users. | ||
/// <note type="warning"> | ||
/// This supports <see cref="IRole"/>, <see cref="IGuildUser"/>, and <see cref="IUser"/> parameter types. | ||
/// </note> | ||
/// </remarks> | ||
/// <exception cref="ArgumentOutOfRangeException"> | ||
/// Thrown when the parameter type is not supported by this precondition attribute. | ||
/// </exception> | ||
/// <seealso cref="RequireBotPermissionAttribute"/> | ||
/// <seealso cref="RequireUserPermissionAttribute"/> | ||
public class DoHierarchyCheckAttribute : ParameterPreconditionAttribute | ||
{ | ||
/// <summary> | ||
/// Gets or sets the error message displayed when the command is used outside of a guild. | ||
/// </summary> | ||
public string NotAGuildErrorMessage { get; set; } = "This command cannot be used outside of a guild."; | ||
|
||
/// <summary> | ||
/// Gets the error message to be returned if execution context doesn't pass the precondition check. | ||
/// </summary> | ||
public string ErrorMessage { get; set; } = "You cannot target anyone who is higher or equal in the hierarchy to you or the bot."; | ||
|
||
/// <inheritdoc /> | ||
/// <exception cref="ArgumentOutOfRangeException"> | ||
/// Thrown when the parameter type is not supported by this precondition attribute. | ||
/// </exception> | ||
public override async Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, ParameterInfo parameterInfo, object value, IServiceProvider services) | ||
{ | ||
if (context.User is not IGuildUser guildUser) | ||
return PreconditionResult.FromError(NotAGuildErrorMessage); | ||
|
||
var hieararchy = PermissionUtils.GetHieararchy(value); | ||
if (hieararchy >= guildUser.Hierarchy || | ||
hieararchy >= (await context.Guild.GetCurrentUserAsync().ConfigureAwait(false)).Hierarchy) | ||
return PreconditionResult.FromError(ErrorMessage); | ||
|
||
return PreconditionResult.FromSuccess(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
using System; | ||
|
||
namespace Discord | ||
{ | ||
/// <summary> | ||
/// Provides a series of helper methods for permissions. | ||
/// </summary> | ||
public static class PermissionUtils | ||
{ | ||
/// <summary> | ||
/// Determines the hierarchy of a target object based on its type. | ||
/// </summary> | ||
/// <param name="target"> | ||
/// The target object: <see cref="IRole"/>, <see cref="IGuildUser"/>, or <see cref="IUser"/>. | ||
/// </param> | ||
/// <returns> | ||
/// An integer representing the hierarchy of the target. | ||
/// </returns> | ||
/// <exception cref="ArgumentOutOfRangeException"> | ||
/// Thrown when the parameter type is not supported by this precondition attribute. | ||
/// </exception> | ||
public static int GetHieararchy(object target) => target switch | ||
{ | ||
// The order of cases here is important to determine the correct hierarchy value. | ||
IRole role => role.Position, | ||
IGuildUser guildUser => guildUser.Hierarchy, | ||
IUser => int.MinValue, | ||
_ => throw new ArgumentOutOfRangeException(nameof(target), "Cannot determine hierarchy for the provided target.") | ||
}; | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
src/Discord.Net.Interactions/Attributes/Preconditions/DoHierarchyCheckAttribute.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
using System; | ||
using System.Threading.Tasks; | ||
|
||
namespace Discord.Interactions | ||
{ | ||
/// <summary> | ||
/// Ensures that command parameters are passed within a correct hierarchical context. | ||
/// </summary> | ||
/// <remarks> | ||
/// Useful for performing hierarchical operations within a guild, such as managing roles or users. | ||
/// <note type="warning"> | ||
/// This supports <see cref="IRole"/>, <see cref="IGuildUser"/>, and <see cref="IUser"/> parameter types. | ||
/// </note> | ||
/// </remarks> | ||
/// <exception cref="ArgumentOutOfRangeException"> | ||
/// Thrown when the parameter type is not supported by this precondition attribute. | ||
/// </exception> | ||
/// <seealso cref="RequireRoleAttribute"/> | ||
/// <seealso cref="RequireBotPermissionAttribute"/> | ||
/// <seealso cref="RequireUserPermissionAttribute"/> | ||
public class DoHierarchyCheckAttribute : ParameterPreconditionAttribute | ||
{ | ||
/// <summary> | ||
/// Gets or sets the error message displayed when the command is used outside of a guild. | ||
/// </summary> | ||
public string NotAGuildErrorMessage { get; set; } = "This command cannot be used outside of a guild."; | ||
|
||
/// <inheritdoc /> | ||
public override string ErrorMessage => "You cannot target anyone who is higher or equal in the hierarchy to you or the bot."; | ||
|
||
/// <inheritdoc /> | ||
/// <exception cref="ArgumentOutOfRangeException"> | ||
/// Thrown when the parameter type is not supported by this precondition attribute. | ||
/// </exception> | ||
public override async Task<PreconditionResult> CheckRequirementsAsync(IInteractionContext context, IParameterInfo parameterInfo, object value, IServiceProvider services) | ||
{ | ||
if (context.User is not IGuildUser guildUser) | ||
return PreconditionResult.FromError(NotAGuildErrorMessage); | ||
|
||
var hieararchy = PermissionUtils.GetHieararchy(value); | ||
if (hieararchy >= guildUser.Hierarchy || | ||
hieararchy >= (await context.Guild.GetCurrentUserAsync().ConfigureAwait(false)).Hierarchy) | ||
return PreconditionResult.FromError(ErrorMessage); | ||
|
||
return PreconditionResult.FromSuccess(); | ||
} | ||
} | ||
} |