[Fix] Modal Write invocation without instance and missing ChannelTypes (#3221)

* add channel types to channel select builder and info

* add channelTypes to select builder from IModal

* remove public setter requirement from modal component definition and add guard clause to inputs

* refactor modal building to run typeConverter writes even without modal instance

* add inline docs to channelTypes props and method

* add property as a target for ChannelTypesAttribute

* move enum option building logic out of enum typeConverter

* add channel type constraint mapping to channel single-select typeConverter

* move SelectMenuOptionAttribute to its own file

* add null forgiving operator to channel type mapping

* remove list initialization from enum modal typeConverter

* disallow channel default value assignment to mentionable selects

* add id property to modal components

* add component id assignment from attributes

* update component attribute ctor signatures and inline docs

* Update src/Discord.Net.Interactions/TypeConverters/ModalComponents/EnumModalComponentConverter.cs

Co-authored-by: Mihail Gribkov <[email protected]>

* replace default values of component ids with 0

---------

Co-authored-by: Mihail Gribkov <[email protected]>

Author: Cenngo

src/Discord.Net.Interactions/Attributes/ChannelTypesAttribute.cs

@@ -7,7 +7,7 @@ namespace Discord.Interactions
     /// <summary>
     ///     Specify the target channel types for a <see cref="ApplicationCommandOptionType.Channel"/> option.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
     public sealed class ChannelTypesAttribute : Attribute
     {
         /// <summary>

src/Discord.Net.Interactions/Attributes/Modals/ModalChannelSelectAttribute.cs

@@ -12,5 +12,9 @@ public class ModalChannelSelectAttribute : ModalSelectComponentAttribute
     ///     Create a new <see cref="ModalChannelSelectAttribute"/>.
     /// </summary>
     /// <param name="customId">Custom ID of the channel select component.</param>
-    public ModalChannelSelectAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues) { }
+    /// <param name="minValues">The minimum number of values that can be selected.</param>
+    /// <param name="maxValues">The maximum number of values that can be selected.</param>
+    /// <param name="id">Optional identifier for the component.</param>
+    public ModalChannelSelectAttribute(string customId, int minValues = 1, int maxValues = 1, int id = 0)
+        : base(customId, minValues, maxValues, id) { }
 }

src/Discord.Net.Interactions/Attributes/Modals/ModalComponentAttribute.cs

@@ -13,5 +13,16 @@ public abstract class ModalComponentAttribute : Attribute
     /// </summary>
     public abstract ComponentType ComponentType { get; }
 
-    internal ModalComponentAttribute() { }
+    /// <summary>
+    ///     Gets the optional identifier for component.
+    /// </summary>
+    /// <remarks>
+    ///     Sending components with an id of 0 is allowed but will be treated as empty and replaced by the API.
+    /// </remarks>
+    public int Id { get; set; }
+
+    internal ModalComponentAttribute(int id = 0)
+    {
+        Id = id;
+    }
 }

src/Discord.Net.Interactions/Attributes/Modals/ModalFileUploadAttribute.cs

@@ -24,7 +24,9 @@ public class ModalFileUploadAttribute : ModalInputAttribute
     /// <param name="customId">Custom ID of the file upload component.</param>
     /// <param name="minValues">Minimum number of files that can be uploaded.</param>
     /// <param name="maxValues">Maximum number of files that can be uploaded.</param>
-    public ModalFileUploadAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId)
+    /// <param name="id">The optional identifier for the component.</param>
+    public ModalFileUploadAttribute(string customId, int minValues = 1, int maxValues = 1, int id = 0)
+        : base(customId, id)
     {
         MinValues = minValues;
         MaxValues = maxValues;

src/Discord.Net.Interactions/Attributes/Modals/ModalInputAttribute.cs

@@ -17,7 +17,8 @@ public abstract class ModalInputAttribute : ModalComponentAttribute
         ///     Create a new <see cref="ModalInputAttribute"/>.
         /// </summary>
         /// <param name="customId">The custom id of the input.</param>
-        internal ModalInputAttribute(string customId)
+        /// <param name="id">Optional identifier for component.</param>
+        internal ModalInputAttribute(string customId, int id) : base(id)
         {
             CustomId = customId;
         }

src/Discord.Net.Interactions/Attributes/Modals/ModalMentionableSelectAttribute.cs

@@ -14,5 +14,7 @@ public class ModalMentionableSelectAttribute : ModalSelectComponentAttribute
     /// <param name="customId">Custom ID of the mentionable select component.</param>
     /// <param name="minValues">Minimum number of values that can be selected.</param>
     /// <param name="maxValues">Maximum number of values that can be selected</param>
-    public ModalMentionableSelectAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues) { }
+    /// <param name="id">The optional identifier for the component.</param>
+    public ModalMentionableSelectAttribute(string customId, int minValues = 1, int maxValues = 1, int id = 0)
+        : base(customId, minValues, maxValues, id) { }
 }

src/Discord.Net.Interactions/Attributes/Modals/ModalRoleSelectAttribute.cs

@@ -14,5 +14,7 @@ public class ModalRoleSelectAttribute : ModalSelectComponentAttribute
     /// <param name="customId">Custom ID of the role select component.</param>
     /// <param name="minValues">Minimum number of values that can be selected.</param>
     /// <param name="maxValues">Maximum number of values that can be selected.</param>
-    public ModalRoleSelectAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues) { }
+    /// <param name="id">The optional identifier for the component.</param>
+    public ModalRoleSelectAttribute(string customId, int minValues = 1, int maxValues = 1, int id = 0)
+        : base(customId, minValues, maxValues, id) { }
 }

src/Discord.Net.Interactions/Attributes/Modals/ModalSelectComponentAttribute.cs

@@ -20,7 +20,8 @@ public abstract class ModalSelectComponentAttribute : ModalInputAttribute
     /// </summary>
     public string Placeholder { get; set; }
 
-    internal ModalSelectComponentAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId)
+    internal ModalSelectComponentAttribute(string customId, int minValues = 1, int maxValues = 1, int id = 0)
+        : base(customId, id)
     {
         MinValues = minValues;
         MaxValues = maxValues;

src/Discord.Net.Interactions/Attributes/Modals/ModalSelectMenuAttribute.cs

@@ -14,5 +14,7 @@ public sealed class ModalSelectMenuAttribute : ModalSelectComponentAttribute
     /// <param name="customId">Custom ID of the select menu component.</param>
     /// <param name="minValues">Minimum number of values that can be selected.</param>
     /// <param name="maxValues">Maximum number of values that can be selected.</param>
-    public ModalSelectMenuAttribute(string customId, int minValues = 1, int maxValues = 1) : base(customId, minValues, maxValues) { }
+    /// <param name="id">The optional identifier for the component.</param>
+    public ModalSelectMenuAttribute(string customId, int minValues = 1, int maxValues = 1, int id = 0)
+        : base(customId, minValues, maxValues, id) { }
 }

src/Discord.Net.Interactions/Attributes/Modals/ModalTextDisplayAttribute.cs

@@ -17,7 +17,9 @@ public class ModalTextDisplayAttribute : ModalComponentAttribute
     ///     Create a new <see cref="ModalTextInputAttribute"/>.
     /// </summary>
     /// <param name="content">Content of the text display.</param>
-    public ModalTextDisplayAttribute(string content = null)
+    /// <param name="id">Optional identifier for component.</param>
+    public ModalTextDisplayAttribute(string content = null, int id = 0)
+        : base(id)
     {
         Content = content;
     }