add emoji support to select menu options

Author: Cenngo

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

@@ -29,6 +29,9 @@ public class ModalSelectMenuOptionAttribute : Attribute
     /// <summary>
     ///     Gets or sets the emote of the option.
     /// </summary>
+    /// <remarks>
+    ///     Can be either an <see cref="Emoji"/> or an <see cref="Discord.Emote"/>
+    /// </remarks>
     public string Emote { get; set; }
 
     /// <summary>
@@ -42,7 +45,7 @@ public class ModalSelectMenuOptionAttribute : Attribute
     /// <param name="label">Label of the option.</param>
     /// <param name="value">Value of the option.</param>
     /// <param name="description">Description of the option.</param>
-    /// <param name="emote">Emote of the option.</param>
+    /// <param name="emote">Emote of the option. Can be either an <see cref="Emoji"/> or an <see cref="Discord.Emote"/></param>
     /// <param name="isDefault">Whether the option is selected by default</param>
     public ModalSelectMenuOptionAttribute(string label, string value, string description = null, string emote = null, bool isDefault = false)
     {

src/Discord.Net.Interactions/Builders/ModuleClassBuilder.cs

@@ -716,16 +716,18 @@ private static void BuildSelectMenuComponent(SelectMenuComponentBuilder builder,
                         builder.Description = inputLabel.Description;
                         break;
                     case ModalSelectMenuOptionAttribute selectMenuOption:
+                        Emoji emoji = null;
+                        Emote emote = null;
 
-                        if (!Emote.TryParse(selectMenuOption.Emote, out var emote) && !string.IsNullOrEmpty(selectMenuOption.Emote))
-                            throw new ArgumentException($"Invalid emote format on {propertyInfo.DeclaringType} modal, {propertyInfo.Name} property");
+                        if (!string.IsNullOrEmpty(selectMenuOption?.Emote) && !(Emote.TryParse(selectMenuOption.Emote, out emote) || Emoji.TryParse(selectMenuOption.Emote, out emoji)))
+                            throw new ArgumentException($"Unable to parse {selectMenuOption.Emote} of {propertyInfo.DeclaringType}.{propertyInfo.Name} into an {typeof(Emote).Name} or an {typeof(Emoji).Name}");
 
                         builder.AddOption(new SelectMenuOptionBuilder
                         {
                             Label = selectMenuOption.Label,
                             Description = selectMenuOption.Description,
                             Value = selectMenuOption.Value,
-                            Emote = emote,
+                            Emote = emote != null ? emote : emoji,
                             IsDefault = selectMenuOption.IsDefault
                         });
                         break;

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

@@ -22,9 +22,17 @@ public EnumModalComponentConverter()
         _options = members.Select(x =>
         {
             var selectMenuOptionAttr = x.GetCustomAttribute<SelectMenuOptionAttribute>();
+
+            Emoji emoji = null;
+            Emote emote = null;
+
+            if (!string.IsNullOrEmpty(selectMenuOptionAttr?.Emote) && !(Emote.TryParse(selectMenuOptionAttr.Emote, out emote) || Emoji.TryParse(selectMenuOptionAttr.Emote, out emoji)))
+                throw new ArgumentException($"Unable to parse {selectMenuOptionAttr.Emote} of {x.DeclaringType.Name}.{x.Name} into an {typeof(Emote).Name} or an {typeof(Emoji).Name}");
+
+
             var hideAttr = x.GetCustomAttribute<HideAttribute>();
             Predicate<IDiscordInteraction> predicate = hideAttr != null ? hideAttr.Predicate : null;
-            return (new SelectMenuOptionBuilder(x.GetCustomAttribute<ChoiceDisplayAttribute>()?.Name ?? x.Name, x.Name, selectMenuOptionAttr?.Description, selectMenuOptionAttr?.Emote != null ? Emote.Parse(selectMenuOptionAttr?.Emote) : null, selectMenuOptionAttr?.IsDefault), predicate);
+            return (new SelectMenuOptionBuilder(x.GetCustomAttribute<ChoiceDisplayAttribute>()?.Name ?? x.Name, x.Name, selectMenuOptionAttr?.Description, emote != null ? emote : emoji, selectMenuOptionAttr?.IsDefault), predicate);
         }).ToImmutableArray();
     }
 
@@ -82,5 +90,8 @@ public class SelectMenuOptionAttribute : Attribute
     /// <summary>
     ///     Gets or sets the emote of the option.
     /// </summary>
+    /// <remarks>
+    ///     Can be either an <see cref="Emoji"/> or an <see cref="Discord.Emote"/>
+    /// </remarks>
     public string Emote { get; set; }
 }