From a8523c5ebdb5ff5f214001dc9a0bb09885f6577c Mon Sep 17 00:00:00 2001
From: Suiram1701 <110390261+Suiram1701@users.noreply.github.com>
Date: Sat, 26 Apr 2025 21:40:21 +0200
Subject: [PATCH] Fixed modals with value type properties (#3091)

* Fixed type reader/converter parsing exception

* Fixed modals with value types properties

* Made OverridesToString result lazy and store it
---
 .../IDiscordInteractionExtensions.cs          |  7 ++++-
 .../InputComponents/TextInputComponentInfo.cs | 10 +++++++
 .../Utilities/ReflectionUtils.cs              | 30 +++++++++++++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/Discord.Net.Interactions/Extensions/IDiscordInteractionExtensions.cs b/src/Discord.Net.Interactions/Extensions/IDiscordInteractionExtensions.cs
index 377d6730..37522633 100644
--- a/src/Discord.Net.Interactions/Extensions/IDiscordInteractionExtensions.cs
+++ b/src/Discord.Net.Interactions/Extensions/IDiscordInteractionExtensions.cs
@@ -68,8 +68,13 @@ namespace Discord.Interactions
                 {
                     case TextInputComponentInfo textComponent:
                         {
+                            var boxedValue = textComponent.Getter(modal);
+                            var value = textComponent.TypeOverridesToString
+                                ? boxedValue.ToString()
+                                : boxedValue as string;
+
                             builder.AddTextInput(textComponent.Label, textComponent.CustomId, textComponent.Style, textComponent.Placeholder, textComponent.IsRequired ? textComponent.MinLength : null,
-                            textComponent.MaxLength, textComponent.IsRequired, textComponent.Getter(modal) as string);
+                                textComponent.MaxLength, textComponent.IsRequired, value);
                         }
                         break;
                     default:
diff --git a/src/Discord.Net.Interactions/Info/InputComponents/TextInputComponentInfo.cs b/src/Discord.Net.Interactions/Info/InputComponents/TextInputComponentInfo.cs
index 613549fe..6831c795 100644
--- a/src/Discord.Net.Interactions/Info/InputComponents/TextInputComponentInfo.cs
+++ b/src/Discord.Net.Interactions/Info/InputComponents/TextInputComponentInfo.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace Discord.Interactions
 {
     /// <summary>
@@ -5,6 +7,12 @@ namespace Discord.Interactions
     /// </summary>
     public class TextInputComponentInfo : InputComponentInfo
     {
+        /// <summary>
+        /// <c>true</c> when <see cref="InputComponentInfo.Type"/> overrides <see cref="object.ToString"/>.
+        /// </summary>
+        internal bool TypeOverridesToString => _typeOverridesToString.Value;
+        private readonly Lazy<bool> _typeOverridesToString;
+
         /// <summary>
         ///     Gets the style of the text input.
         /// </summary>
@@ -37,6 +45,8 @@ namespace Discord.Interactions
             MinLength = builder.MinLength;
             MaxLength = builder.MaxLength;
             InitialValue = builder.InitialValue;
+
+            _typeOverridesToString = new(() => ReflectionUtils<object>.OverridesToString(Type));
         }
     }
 }
diff --git a/src/Discord.Net.Interactions/Utilities/ReflectionUtils.cs b/src/Discord.Net.Interactions/Utilities/ReflectionUtils.cs
index b401027f..fe4c4f0b 100644
--- a/src/Discord.Net.Interactions/Utilities/ReflectionUtils.cs
+++ b/src/Discord.Net.Interactions/Utilities/ReflectionUtils.cs
@@ -177,7 +177,8 @@ namespace Discord.Interactions
         {
             var instanceParam = Expression.Parameter(typeof(T), "instance");
             var prop = Expression.Property(instanceParam, propertyInfo);
-            return Expression.Lambda<Func<T, object>>(prop, instanceParam).Compile();
+            var cast = Expression.Convert(prop, typeof(object));
+            return Expression.Lambda<Func<T, object>>(cast, instanceParam).Compile();
         }
 
         internal static Func<T, object> CreateLambdaPropertyGetter(Type type, PropertyInfo propertyInfo)
@@ -185,7 +186,8 @@ namespace Discord.Interactions
             var instanceParam = Expression.Parameter(typeof(T), "instance");
             var instanceAccess = Expression.Convert(instanceParam, type);
             var prop = Expression.Property(instanceAccess, propertyInfo);
-            return Expression.Lambda<Func<T, object>>(prop, instanceParam).Compile();
+            var cast = Expression.Convert(prop, typeof(object));
+            return Expression.Lambda<Func<T, object>>(cast, instanceParam).Compile();
         }
 
         internal static Func<object[], object[], T> CreateLambdaMemberInit(TypeInfo typeInfo, ConstructorInfo constructor, Predicate<PropertyInfo> propertySelect = null)
@@ -227,5 +229,29 @@ namespace Discord.Interactions
                 return instance;
             };
         }
+
+        /// <summary>
+        /// Checks whether <paramref name="type"/> or any base type of it overrides <see cref="object.ToString"/>.
+        /// </summary>
+        /// <param name="type">The type to check. If <c>null</c> <typeparamref name="T"/> will be used.</param>
+        internal static bool OverridesToString(Type type = null)
+        {
+            type ??= typeof(T);
+
+            do
+            {
+#if NET6_0_OR_GREATER
+                var method = type.GetMethod(nameof(ToString), bindingAttr: BindingFlags.Public | BindingFlags.Instance, types: Type.EmptyTypes);
+#else
+                var method = type.GetMethods(BindingFlags.Public | BindingFlags.Instance)
+                    .SingleOrDefault(m => m.Name == nameof(ToString) && m.GetParameters().Length == 0);
+#endif
+                if (method != null)
+                    return true;
+            }
+            while ((type = type.BaseType) != typeof(object));
+
+            return false;
+        }
     }
 }