notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[frontend/components] Don't allow empty poll choices

Browse source
This commit is contained in:
pancakes 2025-02-18 21:21:25 +10:00 • committed by Laura Hausmann
parent 718a26516a
commit 596b06a962
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Iceshrimp.Frontend/Components/Compose.razor
View file

@ -241,7 +241,7 @@
} }
private bool SendingDisabled() => private bool SendingDisabled() =>
NoteLength - ((NoteDraft.Cw?.Length ?? 0) + NoteDraft.Text.Length) < 0 || UploadingFiles != 0; NoteLength - ((NoteDraft.Cw?.Length ?? 0) + NoteDraft.Text.Length) < 0 || UploadingFiles != 0 || NoteDraft.Poll != null && PollChoices.Count(p => !string.IsNullOrWhiteSpace(p.Value)) < 2;
private async Task HandleKeyDown(KeyboardEventArgs e) private async Task HandleKeyDown(KeyboardEventArgs e)
{ {
@ -403,7 +403,7 @@
if (NoteDraft.Poll != null) if (NoteDraft.Poll != null)
{ {
NoteDraft.Poll.Choices = PollChoices.Select(p => p.Value).ToList(); NoteDraft.Poll.Choices = PollChoices.Select(p => p.Value).Where(p => !string.IsNullOrWhiteSpace(p)).ToList();
NoteDraft.Poll.ExpiresAt = PollExpires switch NoteDraft.Poll.ExpiresAt = PollExpires switch
{ {
PollExpire.ExpiresAt => PollExpireTime.ToUniversalTime(), PollExpire.ExpiresAt => PollExpireTime.ToUniversalTime(),
@ -487,6 +487,7 @@
private void AddPollChoice() private void AddPollChoice()
{ {
if (string.IsNullOrWhiteSpace(PollEntry)) return;
PollChoices.Add(new Choice { Value = PollEntry }); PollChoices.Add(new Choice { Value = PollEntry });
PollEntry = ""; PollEntry = "";
} }