Update Remora.Commands.

Nihlus · Nihlus · commit 244818ed6b84 · 2025-02-13T13:55:45.000+01:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -21,13 +21,13 @@
     <PackageVersion Include="OneOf" Version="3.0.271" />
     <PackageVersion Include="Polly" Version="8.5.2" />
     <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
-    <PackageVersion Include="Remora.Commands" Version="10.0.6" />
-    <PackageVersion Include="Remora.Extensions.Options.Immutable" Version="1.0.8" />
-    <PackageVersion Include="Remora.Rest" Version="3.4.0" />
-    <PackageVersion Include="Remora.Rest.Core" Version="2.2.1" />
-    <PackageVersion Include="Remora.Rest.Xunit" Version="3.0.4" />
-    <PackageVersion Include="Remora.Results" Version="7.4.1" />
-    <PackageVersion Include="Remora.Results.Analyzers" Version="1.0.2" PrivateAssets="all" />
+    <PackageVersion Include="Remora.Commands" Version="11.0.1" />
+    <PackageVersion Include="Remora.Extensions.Options.Immutable" Version="2.0.0" />
+    <PackageVersion Include="Remora.Rest" Version="4.0.0" />
+    <PackageVersion Include="Remora.Rest.Core" Version="3.0.0" />
+    <PackageVersion Include="Remora.Rest.Xunit" Version="4.0.0" />
+    <PackageVersion Include="Remora.Results" Version="8.0.0" />
+    <PackageVersion Include="Remora.Results.Analyzers" Version="1.0.3" PrivateAssets="all" />
     <PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.2" />
diff --git a/Remora.Discord.Commands/Extensions/CommandNodeExtensions.cs b/Remora.Discord.Commands/Extensions/CommandNodeExtensions.cs
@@ -21,6 +21,7 @@
 //
 
 using System;
+using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using Remora.Commands.Trees.Nodes;
@@ -42,7 +43,7 @@ public static class CommandNodeExtensions
     /// <returns>The command type.</returns>
     public static ApplicationCommandType GetCommandType(this CommandNode node)
     {
-        var attribute = node.CommandMethod.GetCustomAttribute<CommandTypeAttribute>();
+        var attribute = node.Attributes.OfType<CommandTypeAttribute>().SingleOrDefault();
         return attribute?.Type ?? ApplicationCommandType.ChatInput;
     }
 
@@ -63,21 +64,15 @@ public static T? FindCustomAttributeOnLocalTree<T>
         bool includeAncestors = true
     ) where T : Attribute
     {
-        // Attempt to first find the attribute on the command itself
-        var attribute = node.CommandMethod.GetCustomAttribute<T>();
+        // Attempt to first find the attribute on the command itself. This catches attributes from any unnamed groups,
+        // which get copied onto the command.
+        var attribute = node.Attributes.OfType<T>().FirstOrDefault();
 
         if (attribute is not null || !includeAncestors)
         {
             return attribute;
         }
 
-        // Check the associated group type directly first
-        attribute = node.GroupType.GetCustomAttribute<T>();
-        if (attribute is not null)
-        {
-            return attribute;
-        }
-
         // Traverse each parent group node, until we find the root node
         var parent = node.Parent;
         while (parent is GroupNode group)
diff --git a/Remora.Discord.Commands/Extensions/CommandTreeExtensions.cs b/Remora.Discord.Commands/Extensions/CommandTreeExtensions.cs
@@ -254,8 +254,7 @@ private static TopLevelMetadata GetCommandNodeMetadata(CommandNode commandNode)
 
         IDiscordPermissionSet? defaultMemberPermissions = null;
         var memberPermissionsAttribute =
-            commandNode.GroupType.GetCustomAttribute<DiscordDefaultMemberPermissionsAttribute>() ??
-            commandNode.CommandMethod.GetCustomAttribute<DiscordDefaultMemberPermissionsAttribute>();
+            commandNode.FindCustomAttributeOnLocalTree<DiscordDefaultMemberPermissionsAttribute>();
 
         if (memberPermissionsAttribute is not null)
         {
@@ -267,38 +266,31 @@ private static TopLevelMetadata GetCommandNodeMetadata(CommandNode commandNode)
 
         var directMessagePermission = default(Optional<bool>);
         var directMessagePermissionAttribute =
-            commandNode.GroupType.GetCustomAttribute<DiscordDefaultDMPermissionAttribute>() ??
-            commandNode.CommandMethod.GetCustomAttribute<DiscordDefaultDMPermissionAttribute>();
+            commandNode.FindCustomAttributeOnLocalTree<DiscordDefaultDMPermissionAttribute>();
 
         if (directMessagePermissionAttribute is not null)
         {
             directMessagePermission = directMessagePermissionAttribute.IsExecutableInDMs;
         }
 
         var isNsfw = default(Optional<bool>);
-        var nsfwAttribute =
-            commandNode.GroupType.GetCustomAttribute<DiscordNsfwAttribute>() ??
-            commandNode.CommandMethod.GetCustomAttribute<DiscordNsfwAttribute>();
+        var nsfwAttribute = commandNode.FindCustomAttributeOnLocalTree<DiscordNsfwAttribute>();
 
         if (nsfwAttribute is not null)
         {
             isNsfw = nsfwAttribute.IsNsfw;
         }
 
         var allowedContextTypes = default(Optional<IReadOnlyList<InteractionContextType>>);
-        var contextsAttribute =
-            commandNode.GroupType.GetCustomAttribute<AllowedContextsAttribute>() ??
-            commandNode.CommandMethod.GetCustomAttribute<AllowedContextsAttribute>();
+        var contextsAttribute = commandNode.FindCustomAttributeOnLocalTree<AllowedContextsAttribute>();
 
         if (contextsAttribute is not null)
         {
             allowedContextTypes = contextsAttribute.Contexts.AsOptional();
         }
 
         var allowedIntegrationTypes = default(Optional<IReadOnlyList<ApplicationIntegrationType>>);
-        var integrationAttribute =
-            commandNode.GroupType.GetCustomAttribute<DiscordInstallContextAttribute>() ??
-            commandNode.CommandMethod.GetCustomAttribute<DiscordInstallContextAttribute>();
+        var integrationAttribute = commandNode.FindCustomAttributeOnLocalTree<DiscordInstallContextAttribute>();
 
         if (integrationAttribute is not null)
         {
@@ -598,7 +590,7 @@ ILocalizationProvider localizationProvider
 
         if (treeDepth > 1)
         {
-            if (command.CommandMethod.GetCustomAttribute<DiscordDefaultDMPermissionAttribute>() is not null)
+            if (command.Attributes.OfType<DiscordDefaultDMPermissionAttribute>().FirstOrDefault() is not null)
             {
                 throw new InvalidNodeException
                 (
@@ -607,7 +599,7 @@ ILocalizationProvider localizationProvider
                 );
             }
 
-            if (command.CommandMethod.GetCustomAttribute<DiscordDefaultMemberPermissionsAttribute>() is not null)
+            if (command.Attributes.OfType<DiscordDefaultMemberPermissionsAttribute>().FirstOrDefault() is not null)
             {
                 throw new InvalidNodeException
                 (
@@ -616,7 +608,7 @@ ILocalizationProvider localizationProvider
                 );
             }
 
-            if (command.CommandMethod.GetCustomAttribute<DiscordNsfwAttribute>() is not null)
+            if (command.Attributes.OfType<DiscordNsfwAttribute>().FirstOrDefault() is not null)
             {
                 throw new InvalidNodeException
                 (
@@ -638,9 +630,9 @@ ILocalizationProvider localizationProvider
                 );
             }
 
-            var parameters = command.CommandMethod.GetParameters();
+            var parameters = command.Shape.Parameters;
             var expectedParameter = commandType.AsParameterName();
-            if (parameters.Length != 1 || parameters[0].Name != expectedParameter)
+            if (parameters.Count != 1 || parameters[0].HintName != expectedParameter)
             {
                 throw new InvalidNodeException
                 (
@@ -718,7 +710,7 @@ ILocalizationProvider localizationProvider
             var actualParameterType = parameter.GetActualParameterType();
             var (enableAutocomplete, choices) = GetParameterChoices
             (
-                parameter.Parameter,
+                parameter,
                 actualParameterType,
                 localizationProvider
             );
@@ -757,7 +749,7 @@ ILocalizationProvider localizationProvider
             }
 
             // Collection parameters
-            var rangeAttribute = parameter.Parameter.GetCustomAttribute<RangeAttribute>();
+            var rangeAttribute = parameter.Attributes.OfType<RangeAttribute>().SingleOrDefault();
             var (minElements, maxElements) = (rangeAttribute?.GetMin() ?? 1, rangeAttribute?.GetMax());
 
             for (ulong i = 0; i < (maxElements ?? minElements); i++)
@@ -801,7 +793,7 @@ ILocalizationProvider localizationProvider
     private static (Optional<bool> EnableAutocomplete, Optional<IReadOnlyList<IApplicationCommandOptionChoice>> Choices)
     GetParameterChoices
     (
-        ParameterInfo parameter,
+        IParameterShape parameter,
         Type actualParameterType,
         ILocalizationProvider localizationProvider
     )
@@ -824,7 +816,7 @@ ILocalizationProvider localizationProvider
         }
         else
         {
-            if (parameter.GetCustomAttribute<AutocompleteAttribute>() is not null)
+            if (parameter.Attributes.OfType<AutocompleteAttribute>().SingleOrDefault() is not null)
             {
                 enableAutocomplete = true;
             }
@@ -840,7 +832,7 @@ private static Optional<IReadOnlyList<ChannelType>> CreateChannelTypesOption
         ApplicationCommandOptionType parameterType
     )
     {
-        var channelTypesAttribute = parameter.Parameter.GetCustomAttribute<ChannelTypesAttribute>();
+        var channelTypesAttribute = parameter.Attributes.OfType<ChannelTypesAttribute>().SingleOrDefault();
         if (channelTypesAttribute is not null && parameterType is not ApplicationCommandOptionType.Channel)
         {
             throw new InvalidCommandParameterException
@@ -1063,8 +1055,8 @@ private static (MinValueAttribute? MinValue, MaxValueAttribute? MaxValue) GetNum
         ApplicationCommandOptionType discordType
     )
     {
-        var minValue = parameter.Parameter.GetCustomAttribute<MinValueAttribute>();
-        var maxValue = parameter.Parameter.GetCustomAttribute<MaxValueAttribute>();
+        var minValue = parameter.Attributes.OfType<MinValueAttribute>().SingleOrDefault();
+        var maxValue = parameter.Attributes.OfType<MaxValueAttribute>().SingleOrDefault();
 
         if (discordType is not (Number or Integer) && (minValue is not null || maxValue is not null))
         {
@@ -1096,8 +1088,8 @@ private static (MinLengthAttribute? MinLength, MaxLengthAttribute? MaxLength) Ge
         ApplicationCommandOptionType discordType
     )
     {
-        var minLength = parameter.Parameter.GetCustomAttribute<MinLengthAttribute>();
-        var maxLength = parameter.Parameter.GetCustomAttribute<MaxLengthAttribute>();
+        var minLength = parameter.Attributes.OfType<MinLengthAttribute>().SingleOrDefault();
+        var maxLength = parameter.Attributes.OfType<MaxLengthAttribute>().SingleOrDefault();
 
         var isNonStringWithLengthConstraint = discordType is not ApplicationCommandOptionType.String
                                               && (minLength is not null || maxLength is not null);
diff --git a/Remora.Discord.Commands/Extensions/ParameterShapeExtensions.cs b/Remora.Discord.Commands/Extensions/ParameterShapeExtensions.cs
@@ -24,7 +24,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using Remora.Commands.Extensions;
 using Remora.Commands.Signatures;
 using Remora.Discord.API.Abstractions.Objects;
 using Remora.Discord.Commands.Attributes;
@@ -47,7 +46,7 @@ public static class ParameterShapeExtensions
     /// <returns>The actual type.</returns>
     public static Type GetActualParameterType(this IParameterShape shape, bool unwrapCollections = false)
     {
-        var parameterType = shape.Parameter.ParameterType;
+        var parameterType = shape.ParameterType;
 
         // Unwrap the parameter type if it's a Nullable<T> or Optional<T>
         // TODO: Maybe more cases?
@@ -81,7 +80,7 @@ public static Type GetActualParameterType(this IParameterShape shape, bool unwra
     /// <returns>The option type.</returns>
     public static ApplicationCommandOptionType GetDiscordType(this IParameterShape shape)
     {
-        var typeHint = shape.Parameter.GetCustomAttribute<DiscordTypeHintAttribute>();
+        var typeHint = shape.Attributes.OfType<DiscordTypeHintAttribute>().SingleOrDefault();
         if (typeHint is not null)
         {
             return (ApplicationCommandOptionType)typeHint.TypeHint;
diff --git a/Remora.Discord.Commands/Responders/AutocompleteResponder.cs b/Remora.Discord.Commands/Responders/AutocompleteResponder.cs
@@ -119,7 +119,7 @@ public async Task<Result> RespondAsync(IInteractionCreate gatewayEvent, Cancella
             return new InvalidOperationError("Autocomplete interaction without focused option received. Desync?");
         }
 
-        var realParameter = commandNode.CommandMethod.GetParameters().First
+        var realParameter = commandNode.Invoke.Method.GetParameters().First
         (
             p => p.Name is not null && p.Name.Equals(focusedParameter.Name, StringComparison.OrdinalIgnoreCase)
         );
diff --git a/Tests/Remora.Discord.Commands.Tests/Extensions/ParameterShapeExtensionsTests.cs b/Tests/Remora.Discord.Commands.Tests/Extensions/ParameterShapeExtensionsTests.cs
@@ -21,6 +21,7 @@
 //
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using Moq;
 using Remora.Commands.Signatures;
@@ -52,11 +53,9 @@ public class GetActualParameterType
         [Theory]
         public void ReturnsCorrectly(Type parameterType, Type expectedResult)
         {
-            var parameterInfoMock = new Mock<ParameterInfo>();
             var parameterShapeMock = new Mock<IParameterShape>();
 
-            parameterInfoMock.SetupGet(p => p.ParameterType).Returns(parameterType);
-            parameterShapeMock.SetupGet(p => p.Parameter).Returns(parameterInfoMock.Object);
+            parameterShapeMock.SetupGet(p => p.ParameterType).Returns(parameterType);
 
             Assert.Equal(expectedResult, parameterShapeMock.Object.GetActualParameterType());
         }
@@ -102,11 +101,10 @@ public void ReturnsWithoutTypeHintAttributeCorrectly
             ApplicationCommandOptionType expectedResult
         )
         {
-            var parameterInfoMock = new Mock<ParameterInfo>();
             var parameterShapeMock = new Mock<IParameterShape>();
 
-            parameterInfoMock.SetupGet(p => p.ParameterType).Returns(parameterType);
-            parameterShapeMock.SetupGet(p => p.Parameter).Returns(parameterInfoMock.Object);
+            parameterShapeMock.SetupGet(p => p.Attributes).Returns(new List<Attribute>());
+            parameterShapeMock.SetupGet(p => p.ParameterType).Returns(parameterType);
 
             Assert.Equal(expectedResult, parameterShapeMock.Object.GetDiscordType());
         }
@@ -132,20 +130,18 @@ ApplicationCommandOptionType expectedResult
         [Theory]
         public void ReturnsWithTypeHintAttributeCorrectly(Type parameterType)
         {
-            var parameterInfoMock = new Mock<ParameterInfo>();
             var parameterShapeMock = new Mock<IParameterShape>();
 
-            parameterInfoMock.Setup(p => p.GetCustomAttributes(typeof(DiscordTypeHintAttribute), false))
+            parameterShapeMock.SetupGet(p => p.Attributes)
                 .Returns
                 (
-                    new object[]
+                    new List<Attribute>
                     {
                         new DiscordTypeHintAttribute(TypeHint.String)
                     }
                 );
 
-            parameterInfoMock.SetupGet(p => p.ParameterType).Returns(parameterType);
-            parameterShapeMock.SetupGet(p => p.Parameter).Returns(parameterInfoMock.Object);
+            parameterShapeMock.SetupGet(p => p.ParameterType).Returns(parameterType);
 
             Assert.Equal(ApplicationCommandOptionType.String, parameterShapeMock.Object.GetDiscordType());
         }

Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,7 @@ private static TopLevelMetadata GetCommandNodeMetadata(CommandNode commandNode)`
`254`	`254`
`255`	`255`	`IDiscordPermissionSet? defaultMemberPermissions = null;`
`256`	`256`	`var memberPermissionsAttribute =`
`257`		`- commandNode.GroupType.GetCustomAttribute<DiscordDefaultMemberPermissionsAttribute>() ??`
`258`		`- commandNode.CommandMethod.GetCustomAttribute<DiscordDefaultMemberPermissionsAttribute>();`
	`257`	`+ commandNode.FindCustomAttributeOnLocalTree<DiscordDefaultMemberPermissionsAttribute>();`
`259`	`258`
`260`	`259`	`if (memberPermissionsAttribute is not null)`
`261`	`260`	`{`
`@@ -267,38 +266,31 @@ private static TopLevelMetadata GetCommandNodeMetadata(CommandNode commandNode)`
`267`	`266`
`268`	`267`	`var directMessagePermission = default(Optional<bool>);`
`269`	`268`	`var directMessagePermissionAttribute =`
`270`		`- commandNode.GroupType.GetCustomAttribute<DiscordDefaultDMPermissionAttribute>() ??`
`271`		`- commandNode.CommandMethod.GetCustomAttribute<DiscordDefaultDMPermissionAttribute>();`
	`269`	`+ commandNode.FindCustomAttributeOnLocalTree<DiscordDefaultDMPermissionAttribute>();`
`272`	`270`
`273`	`271`	`if (directMessagePermissionAttribute is not null)`
`274`	`272`	`{`
`275`	`273`	`directMessagePermission = directMessagePermissionAttribute.IsExecutableInDMs;`
`276`	`274`	`}`
`277`	`275`
`278`	`276`	`var isNsfw = default(Optional<bool>);`
`279`		`- var nsfwAttribute =`
`280`		`- commandNode.GroupType.GetCustomAttribute<DiscordNsfwAttribute>() ??`
`281`		`- commandNode.CommandMethod.GetCustomAttribute<DiscordNsfwAttribute>();`
	`277`	`+ var nsfwAttribute = commandNode.FindCustomAttributeOnLocalTree<DiscordNsfwAttribute>();`
`282`	`278`
`283`	`279`	`if (nsfwAttribute is not null)`
`284`	`280`	`{`
`285`	`281`	`isNsfw = nsfwAttribute.IsNsfw;`
`286`	`282`	`}`
`287`	`283`
`288`	`284`	`var allowedContextTypes = default(Optional<IReadOnlyList<InteractionContextType>>);`
`289`		`- var contextsAttribute =`
`290`		`- commandNode.GroupType.GetCustomAttribute<AllowedContextsAttribute>() ??`
`291`		`- commandNode.CommandMethod.GetCustomAttribute<AllowedContextsAttribute>();`
	`285`	`+ var contextsAttribute = commandNode.FindCustomAttributeOnLocalTree<AllowedContextsAttribute>();`
`292`	`286`
`293`	`287`	`if (contextsAttribute is not null)`
`294`	`288`	`{`
`295`	`289`	`allowedContextTypes = contextsAttribute.Contexts.AsOptional();`
`296`	`290`	`}`
`297`	`291`
`298`	`292`	`var allowedIntegrationTypes = default(Optional<IReadOnlyList<ApplicationIntegrationType>>);`
`299`		`- var integrationAttribute =`
`300`		`- commandNode.GroupType.GetCustomAttribute<DiscordInstallContextAttribute>() ??`
`301`		`- commandNode.CommandMethod.GetCustomAttribute<DiscordInstallContextAttribute>();`
	`293`	`+ var integrationAttribute = commandNode.FindCustomAttributeOnLocalTree<DiscordInstallContextAttribute>();`
`302`	`294`
`303`	`295`	`if (integrationAttribute is not null)`
`304`	`296`	`{`
`@@ -598,7 +590,7 @@ ILocalizationProvider localizationProvider`
`598`	`590`
`599`	`591`	`if (treeDepth > 1)`
`600`	`592`	`{`
`601`		`- if (command.CommandMethod.GetCustomAttribute<DiscordDefaultDMPermissionAttribute>() is not null)`
	`593`	`+ if (command.Attributes.OfType<DiscordDefaultDMPermissionAttribute>().FirstOrDefault() is not null)`
`602`	`594`	`{`
`603`	`595`	`throw new InvalidNodeException`
`604`	`596`	`(`
`@@ -607,7 +599,7 @@ ILocalizationProvider localizationProvider`
`607`	`599`	`);`
`608`	`600`	`}`
`609`	`601`
`610`		`- if (command.CommandMethod.GetCustomAttribute<DiscordDefaultMemberPermissionsAttribute>() is not null)`
	`602`	`+ if (command.Attributes.OfType<DiscordDefaultMemberPermissionsAttribute>().FirstOrDefault() is not null)`
`611`	`603`	`{`
`612`	`604`	`throw new InvalidNodeException`
`613`	`605`	`(`
`@@ -616,7 +608,7 @@ ILocalizationProvider localizationProvider`
`616`	`608`	`);`
`617`	`609`	`}`
`618`	`610`
`619`		`- if (command.CommandMethod.GetCustomAttribute<DiscordNsfwAttribute>() is not null)`
	`611`	`+ if (command.Attributes.OfType<DiscordNsfwAttribute>().FirstOrDefault() is not null)`
`620`	`612`	`{`
`621`	`613`	`throw new InvalidNodeException`
`622`	`614`	`(`
`@@ -638,9 +630,9 @@ ILocalizationProvider localizationProvider`
`638`	`630`	`);`
`639`	`631`	`}`
`640`	`632`
`641`		`- var parameters = command.CommandMethod.GetParameters();`
	`633`	`+ var parameters = command.Shape.Parameters;`
`642`	`634`	`var expectedParameter = commandType.AsParameterName();`
`643`		`- if (parameters.Length != 1 \|\| parameters[0].Name != expectedParameter)`
	`635`	`+ if (parameters.Count != 1 \|\| parameters[0].HintName != expectedParameter)`
`644`	`636`	`{`
`645`	`637`	`throw new InvalidNodeException`
`646`	`638`	`(`
`@@ -718,7 +710,7 @@ ILocalizationProvider localizationProvider`
`718`	`710`	`var actualParameterType = parameter.GetActualParameterType();`
`719`	`711`	`var (enableAutocomplete, choices) = GetParameterChoices`
`720`	`712`	`(`
`721`		`- parameter.Parameter,`
	`713`	`+ parameter,`
`722`	`714`	`actualParameterType,`
`723`	`715`	`localizationProvider`
`724`	`716`	`);`
`@@ -757,7 +749,7 @@ ILocalizationProvider localizationProvider`
`757`	`749`	`}`
`758`	`750`
`759`	`751`	`// Collection parameters`
`760`		`- var rangeAttribute = parameter.Parameter.GetCustomAttribute<RangeAttribute>();`
	`752`	`+ var rangeAttribute = parameter.Attributes.OfType<RangeAttribute>().SingleOrDefault();`
`761`	`753`	`var (minElements, maxElements) = (rangeAttribute?.GetMin() ?? 1, rangeAttribute?.GetMax());`
`762`	`754`
`763`	`755`	`for (ulong i = 0; i < (maxElements ?? minElements); i++)`
`@@ -801,7 +793,7 @@ ILocalizationProvider localizationProvider`
`801`	`793`	`private static (Optional<bool> EnableAutocomplete, Optional<IReadOnlyList<IApplicationCommandOptionChoice>> Choices)`
`802`	`794`	`GetParameterChoices`
`803`	`795`	`(`
`804`		`- ParameterInfo parameter,`
	`796`	`+ IParameterShape parameter,`
`805`	`797`	`Type actualParameterType,`
`806`	`798`	`ILocalizationProvider localizationProvider`
`807`	`799`	`)`
`@@ -824,7 +816,7 @@ ILocalizationProvider localizationProvider`
`824`	`816`	`}`
`825`	`817`	`else`
`826`	`818`	`{`
`827`		`- if (parameter.GetCustomAttribute<AutocompleteAttribute>() is not null)`
	`819`	`+ if (parameter.Attributes.OfType<AutocompleteAttribute>().SingleOrDefault() is not null)`
`828`	`820`	`{`
`829`	`821`	`enableAutocomplete = true;`
`830`	`822`	`}`
`@@ -840,7 +832,7 @@ private static Optional<IReadOnlyList<ChannelType>> CreateChannelTypesOption`
`840`	`832`	`ApplicationCommandOptionType parameterType`
`841`	`833`	`)`
`842`	`834`	`{`
`843`		`- var channelTypesAttribute = parameter.Parameter.GetCustomAttribute<ChannelTypesAttribute>();`
	`835`	`+ var channelTypesAttribute = parameter.Attributes.OfType<ChannelTypesAttribute>().SingleOrDefault();`
`844`	`836`	`if (channelTypesAttribute is not null && parameterType is not ApplicationCommandOptionType.Channel)`
`845`	`837`	`{`
`846`	`838`	`throw new InvalidCommandParameterException`
`@@ -1063,8 +1055,8 @@ private static (MinValueAttribute? MinValue, MaxValueAttribute? MaxValue) GetNum`
`1063`	`1055`	`ApplicationCommandOptionType discordType`
`1064`	`1056`	`)`
`1065`	`1057`	`{`
`1066`		`- var minValue = parameter.Parameter.GetCustomAttribute<MinValueAttribute>();`
`1067`		`- var maxValue = parameter.Parameter.GetCustomAttribute<MaxValueAttribute>();`
	`1058`	`+ var minValue = parameter.Attributes.OfType<MinValueAttribute>().SingleOrDefault();`
	`1059`	`+ var maxValue = parameter.Attributes.OfType<MaxValueAttribute>().SingleOrDefault();`
`1068`	`1060`
`1069`	`1061`	`if (discordType is not (Number or Integer) && (minValue is not null \|\| maxValue is not null))`
`1070`	`1062`	`{`
`@@ -1096,8 +1088,8 @@ private static (MinLengthAttribute? MinLength, MaxLengthAttribute? MaxLength) Ge`
`1096`	`1088`	`ApplicationCommandOptionType discordType`
`1097`	`1089`	`)`
`1098`	`1090`	`{`
`1099`		`- var minLength = parameter.Parameter.GetCustomAttribute<MinLengthAttribute>();`
`1100`		`- var maxLength = parameter.Parameter.GetCustomAttribute<MaxLengthAttribute>();`
	`1091`	`+ var minLength = parameter.Attributes.OfType<MinLengthAttribute>().SingleOrDefault();`
	`1092`	`+ var maxLength = parameter.Attributes.OfType<MaxLengthAttribute>().SingleOrDefault();`
`1101`	`1093`
`1102`	`1094`	`var isNonStringWithLengthConstraint = discordType is not ApplicationCommandOptionType.String`
`1103`	`1095`	`&& (minLength is not null \|\| maxLength is not null);`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public async Task<Result> RespondAsync(IInteractionCreate gatewayEvent, Cancella`
`119`	`119`	`return new InvalidOperationError("Autocomplete interaction without focused option received. Desync?");`
`120`	`120`	`}`
`121`	`121`
`122`		`- var realParameter = commandNode.CommandMethod.GetParameters().First`
	`122`	`+ var realParameter = commandNode.Invoke.Method.GetParameters().First`
`123`	`123`	`(`
`124`	`124`	`p => p.Name is not null && p.Name.Equals(focusedParameter.Name, StringComparison.OrdinalIgnoreCase)`
`125`	`125`	`);`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`//`
`22`	`22`
`23`	`23`	`using System;`
	`24`	`+using System.Collections.Generic;`
`24`	`25`	`using System.Reflection;`
`25`	`26`	`using Moq;`
`26`	`27`	`using Remora.Commands.Signatures;`
`@@ -52,11 +53,9 @@ public class GetActualParameterType`
`52`	`53`	`[Theory]`
`53`	`54`	`public void ReturnsCorrectly(Type parameterType, Type expectedResult)`
`54`	`55`	`{`
`55`		`- var parameterInfoMock = new Mock<ParameterInfo>();`
`56`	`56`	`var parameterShapeMock = new Mock<IParameterShape>();`
`57`	`57`
`58`		`- parameterInfoMock.SetupGet(p => p.ParameterType).Returns(parameterType);`
`59`		`- parameterShapeMock.SetupGet(p => p.Parameter).Returns(parameterInfoMock.Object);`
	`58`	`+ parameterShapeMock.SetupGet(p => p.ParameterType).Returns(parameterType);`
`60`	`59`
`61`	`60`	`Assert.Equal(expectedResult, parameterShapeMock.Object.GetActualParameterType());`
`62`	`61`	`}`
`@@ -102,11 +101,10 @@ public void ReturnsWithoutTypeHintAttributeCorrectly`
`102`	`101`	`ApplicationCommandOptionType expectedResult`
`103`	`102`	`)`
`104`	`103`	`{`
`105`		`- var parameterInfoMock = new Mock<ParameterInfo>();`
`106`	`104`	`var parameterShapeMock = new Mock<IParameterShape>();`
`107`	`105`
`108`		`- parameterInfoMock.SetupGet(p => p.ParameterType).Returns(parameterType);`
`109`		`- parameterShapeMock.SetupGet(p => p.Parameter).Returns(parameterInfoMock.Object);`
	`106`	`+ parameterShapeMock.SetupGet(p => p.Attributes).Returns(new List<Attribute>());`
	`107`	`+ parameterShapeMock.SetupGet(p => p.ParameterType).Returns(parameterType);`
`110`	`108`
`111`	`109`	`Assert.Equal(expectedResult, parameterShapeMock.Object.GetDiscordType());`
`112`	`110`	`}`
`@@ -132,20 +130,18 @@ ApplicationCommandOptionType expectedResult`
`132`	`130`	`[Theory]`
`133`	`131`	`public void ReturnsWithTypeHintAttributeCorrectly(Type parameterType)`
`134`	`132`	`{`
`135`		`- var parameterInfoMock = new Mock<ParameterInfo>();`
`136`	`133`	`var parameterShapeMock = new Mock<IParameterShape>();`
`137`	`134`
`138`		`- parameterInfoMock.Setup(p => p.GetCustomAttributes(typeof(DiscordTypeHintAttribute), false))`
	`135`	`+ parameterShapeMock.SetupGet(p => p.Attributes)`
`139`	`136`	`.Returns`
`140`	`137`	`(`
`141`		`- new object[]`
	`138`	`+ new List<Attribute>`
`142`	`139`	`{`
`143`	`140`	`new DiscordTypeHintAttribute(TypeHint.String)`
`144`	`141`	`}`
`145`	`142`	`);`
`146`	`143`
`147`		`- parameterInfoMock.SetupGet(p => p.ParameterType).Returns(parameterType);`
`148`		`- parameterShapeMock.SetupGet(p => p.Parameter).Returns(parameterInfoMock.Object);`
	`144`	`+ parameterShapeMock.SetupGet(p => p.ParameterType).Returns(parameterType);`
`149`	`145`
`150`	`146`	`Assert.Equal(ApplicationCommandOptionType.String, parameterShapeMock.Object.GetDiscordType());`
`151`	`147`	`}`