Skip to content

Fixed type reader/converter parsing exception #3084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2025
Merged

Fixed type reader/converter parsing exception #3084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...d.Net.Interactions/TypeConverters/ComponentInteractions/DefaultValueComponentConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ public override Task<TypeConverterResult> ReadAsync(IInteractionContext context,
_ => Task.FromResult(TypeConverterResult.FromError(InteractionCommandError.ConvertFailed, $"{option.Type} doesn't have a convertible value."))
};
}
catch (InvalidCastException castEx)
catch (Exception ex) when (ex is FormatException or InvalidCastException)
{
return Task.FromResult(TypeConverterResult.FromError(castEx));
return Task.FromResult(TypeConverterResult.FromError(ex));
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/Discord.Net.Interactions/TypeConverters/SlashCommands/DefaultValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public override ApplicationCommandOptionType GetDiscordType()
public override Task<TypeConverterResult> ReadAsync(IInteractionContext context, IApplicationCommandInteractionDataOption option, IServiceProvider services)
{
object value;

if (option.Value is Optional<object> optional)
value = optional.IsSpecified ? optional.Value : default(T);
else
Expand All @@ -52,9 +51,9 @@ public override Task<TypeConverterResult> ReadAsync(IInteractionContext context,
var converted = Convert.ChangeType(value, typeof(T));
return Task.FromResult(TypeConverterResult.FromSuccess(converted));
}
catch (InvalidCastException castEx)
catch (Exception ex) when (ex is FormatException or InvalidCastException)
{
return Task.FromResult(TypeConverterResult.FromError(castEx));
return Task.FromResult(TypeConverterResult.FromError(ex));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Discord.Net.Interactions/TypeReaders/DefaultValueReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public override Task<TypeConverterResult> ReadAsync(IInteractionContext context,
var converted = Convert.ChangeType(option, typeof(T));
return Task.FromResult(TypeConverterResult.FromSuccess(converted));
}
catch (InvalidCastException castEx)
catch (Exception ex) when (ex is FormatException or InvalidCastException)
{
return Task.FromResult(TypeConverterResult.FromError(castEx));
return Task.FromResult(TypeConverterResult.FromError(ex));
}
}
}
Expand Down