From 55999a8bad6d3fce0b654448e79e1fcf78cc7afb Mon Sep 17 00:00:00 2001 From: Bogdan Date: Mon, 17 Apr 2023 02:19:52 +0300 Subject: [PATCH] Rename `CC` to `Cc` --- .../EmailTests/EmailSettingsValidatorFixture.cs | 4 ++-- src/NzbDrone.Core/Notifications/Email/Email.cs | 2 +- .../Notifications/Email/EmailSettings.cs | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/NzbDrone.Core.Test/NotificationTests/EmailTests/EmailSettingsValidatorFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/EmailTests/EmailSettingsValidatorFixture.cs index 8f54b217b..13ba44089 100644 --- a/src/NzbDrone.Core.Test/NotificationTests/EmailTests/EmailSettingsValidatorFixture.cs +++ b/src/NzbDrone.Core.Test/NotificationTests/EmailTests/EmailSettingsValidatorFixture.cs @@ -75,7 +75,7 @@ public void should_not_be_valid_if_to_is_invalid(string email) [TestCase("readarr.com")] public void should_not_be_valid_if_cc_is_invalid(string email) { - _emailSettings.CC = new string[] { email }; + _emailSettings.Cc = new string[] { email }; _validator.Validate(_emailSettings).IsValid.Should().BeFalse(); } @@ -94,7 +94,7 @@ public void should_not_be_valid_if_bcc_is_invalid(string email) public void should_not_be_valid_if_to_bcc_cc_are_all_empty() { _emailSettings.To = Array.Empty(); - _emailSettings.CC = Array.Empty(); + _emailSettings.Cc = Array.Empty(); _emailSettings.Bcc = Array.Empty(); _validator.Validate(_emailSettings).IsValid.Should().BeFalse(); diff --git a/src/NzbDrone.Core/Notifications/Email/Email.cs b/src/NzbDrone.Core/Notifications/Email/Email.cs index e3f7c7d9e..f69f7214e 100644 --- a/src/NzbDrone.Core/Notifications/Email/Email.cs +++ b/src/NzbDrone.Core/Notifications/Email/Email.cs @@ -119,7 +119,7 @@ private void SendEmail(EmailSettings settings, string subject, string body, bool email.From.Add(ParseAddress("From", settings.From)); email.To.AddRange(settings.To.Select(x => ParseAddress("To", x))); - email.Cc.AddRange(settings.CC.Select(x => ParseAddress("CC", x))); + email.Cc.AddRange(settings.Cc.Select(x => ParseAddress("CC", x))); email.Bcc.AddRange(settings.Bcc.Select(x => ParseAddress("BCC", x))); email.Subject = subject; diff --git a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs index 351934c0c..cd6528b98 100644 --- a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs +++ b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs @@ -16,13 +16,13 @@ public EmailSettingsValidator() RuleFor(c => c.Port).InclusiveBetween(1, 65535); RuleFor(c => c.From).NotEmpty(); RuleForEach(c => c.To).EmailAddress(); - RuleForEach(c => c.CC).EmailAddress(); + RuleForEach(c => c.Cc).EmailAddress(); RuleForEach(c => c.Bcc).EmailAddress(); // Only require one of three send fields to be set - RuleFor(c => c.To).NotEmpty().Unless(c => c.Bcc.Any() || c.CC.Any()); - RuleFor(c => c.CC).NotEmpty().Unless(c => c.To.Any() || c.Bcc.Any()); - RuleFor(c => c.Bcc).NotEmpty().Unless(c => c.To.Any() || c.CC.Any()); + RuleFor(c => c.To).NotEmpty().Unless(c => c.Bcc.Any() || c.Cc.Any()); + RuleFor(c => c.Cc).NotEmpty().Unless(c => c.To.Any() || c.Bcc.Any()); + RuleFor(c => c.Bcc).NotEmpty().Unless(c => c.To.Any() || c.Cc.Any()); } } @@ -36,7 +36,7 @@ public EmailSettings() Port = 587; To = Array.Empty(); - CC = Array.Empty(); + Cc = Array.Empty(); Bcc = Array.Empty(); } @@ -62,7 +62,7 @@ public EmailSettings() public IEnumerable To { get; set; } [FieldDefinition(7, Label = "CC Address(es)", HelpText = "Comma seperated list of email cc recipients", Advanced = true)] - public IEnumerable CC { get; set; } + public IEnumerable Cc { get; set; } [FieldDefinition(8, Label = "BCC Address(es)", HelpText = "Comma seperated list of email bcc recipients", Advanced = true)] public IEnumerable Bcc { get; set; }