Skip to content

Commit 1f4238f

Browse files
committed
fix nre in respondwithmodal extension method
1 parent cfd55f8 commit 1f4238f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Discord.Net.Interactions/Extensions/IDiscordInteractionExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static async Task<Modal> ToModalAsync<T>(this IDiscordInteraction interac
7474
if (!modalInfo.Type.IsAssignableFrom(typeof(T)))
7575
throw new ArgumentException($"{modalInfo.Type.FullName} isn't assignable from {typeof(T).FullName}.");
7676

77-
var builder = new ModalBuilder(modalInstance.Title, customId);
77+
var builder = new ModalBuilder(modalInstance?.Title ?? modalInfo.Title, customId);
7878

7979
foreach (var input in modalInfo.Components)
8080
switch (input)
@@ -134,7 +134,7 @@ public static async Task<Modal> ToModalAsync<T>(this IDiscordInteraction interac
134134
break;
135135
case TextDisplayComponentInfo textDisplayComponent:
136136
{
137-
var content = textDisplayComponent.Getter(modalInstance).ToString() ?? textDisplayComponent.Content;
137+
var content = modalInstance is not null ? textDisplayComponent.Getter(modalInstance).ToString() : (textDisplayComponent.DefaultValue as string) ?? textDisplayComponent.Content;
138138
var componentBuilder = new TextDisplayBuilder(content);
139139
builder.AddTextDisplay(componentBuilder);
140140
}

0 commit comments

Comments
 (0)