Skip to content
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

Jump to bottom

[Fix] Prevent multiline values in short TextInputs #2789

Merged
merged 4 commits into from
Oct 17, 2023
Merged

[Fix] Prevent multiline values in short TextInputs #2789

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9427314
Prevent multiline values in short Textinputs
BattleRush Oct 13, 2023
10bd298
Change exception
BattleRush Oct 13, 2023
072121a
Move check to build method
BattleRush Oct 17, 2023
273c794
Update src/Discord.Net.Core/Entities/Interactions/MessageComponents/C…
Misha-133 Oct 17, 2023
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
7 changes: 7 additions & 0 deletions src/Discord.Net.Core/Entities/Interactions/MessageComponents/ComponentBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,6 +1406,9 @@ public int? MaxLength
/// <exception cref="ArgumentOutOfRangeException">
/// <see cref="Value"/>.Length is greater than <see cref="LargestMaxLength"/> or <see cref="MaxLength"/>.
/// </exception>
/// <exception cref="ArgumentException">
/// <see cref="Style"/> is <see cref="TextInputStyle.Short"/> and <see cref="Value"/> contains a new line character.
/// </exception>
public string Value
{
get => _value;
Expand All @@ -1415,6 +1418,7 @@ public string Value
throw new ArgumentOutOfRangeException(nameof(value), $"Value must not be longer than {MaxLength ?? LargestMaxLength}.");
if (value?.Length < (MinLength ?? 0))
throw new ArgumentOutOfRangeException(nameof(value), $"Value must not be shorter than {MinLength}");

_value = value;
}
}
Expand Down Expand Up @@ -1550,6 +1554,9 @@ public TextInputComponent Build()
throw new ArgumentException("TextInputComponents must have a custom id.", nameof(CustomId));
if (string.IsNullOrWhiteSpace(Label))
throw new ArgumentException("TextInputComponents must have a label.", nameof(Label));
if (Style == TextInputStyle.Short && Value?.Contains('\n') == true)
throw new ArgumentException($"Value must not contain new line characters when style is {TextInputStyle.Short}.", nameof(Value));

return new TextInputComponent(CustomId, Label, Placeholder, MinLength, MaxLength, Style, Required, Value);
}
}
Expand Down