diff --git a/src/forms.rs b/src/forms.rs index 4360ac9..25d6ef1 100644 --- a/src/forms.rs +++ b/src/forms.rs @@ -7,13 +7,13 @@ use crate::config::CustomField; /// Fields of the contact form that persist after a redirection /// (example after failed server side validation). #[derive(Deserialize)] -pub struct PersistantFieldContents { +pub struct PersistentFieldContents { pub name: String, pub email: String, pub custom: Vec, } -impl PersistantFieldContents { +impl PersistentFieldContents { pub fn new_empty(custom_fields: &[CustomField]) -> Self { Self { name: String::default(), @@ -29,7 +29,7 @@ pub struct ContactForm { /// The id for the captcha. pub id: u16, #[serde(flatten)] - pub persistant_field_contents: PersistantFieldContents, + pub persistent_field_contents: PersistentFieldContents, pub captcha_answer: String, } @@ -64,7 +64,7 @@ impl ContactForm { Ok(Self { id, - persistant_field_contents: PersistantFieldContents { + persistent_field_contents: PersistentFieldContents { name, email, custom, diff --git a/src/mailer.rs b/src/mailer.rs index 34957f6..1cd44b0 100644 --- a/src/mailer.rs +++ b/src/mailer.rs @@ -11,7 +11,7 @@ use tracing::info; use crate::{ config::{Config, StateConfig}, - forms::PersistantFieldContents, + forms::PersistentFieldContents, }; type ASmtpTransport = AsyncSmtpTransport; @@ -66,14 +66,14 @@ impl Mailer { /// Sends a mail with data from the contact form. pub async fn send( &self, - persistant_field_contents: &PersistantFieldContents, + persistent_field_contents: &PersistentFieldContents, config: &StateConfig, ) -> Result<()> { - let name = persistant_field_contents.name.trim().to_string(); + let name = persistent_field_contents.name.trim().to_string(); let subject = config.strings.message_from.clone() + &name; let reply_to = Mailbox::new( Some(name), - persistant_field_contents + persistent_field_contents .email .parse() .context("Failed to parse the email from the form to an address!")?, @@ -82,16 +82,16 @@ impl Mailer { let default_fields_content = format!( "{}: {}\n\n{}: {}\n\n\n", config.strings.name_field.label, - persistant_field_contents.name, + persistent_field_contents.name, config.strings.email_field.label, - persistant_field_contents.email + persistent_field_contents.email ); let body = config .custom_fields .iter() .map(|field| &field.label) .zip( - persistant_field_contents + persistent_field_contents .custom .iter() .map(|content| content.trim()), diff --git a/src/routes.rs b/src/routes.rs index 4242f64..e5747b0 100644 --- a/src/routes.rs +++ b/src/routes.rs @@ -14,7 +14,7 @@ use crate::{ captcha_solutions::CaptchaSolutions, config::StateConfig, errors::AppError, - forms::{ContactForm, PersistantFieldContents}, + forms::{ContactForm, PersistentFieldContents}, mailer::Mailer, templates, }; @@ -23,7 +23,7 @@ use crate::{ pub struct ContactFormParams<'a> { config: Arc, captcha_solutions: Arc>, - persistant_field_contents: Option, + persistent_field_contents: Option, error_message: Option<&'a str>, } @@ -43,12 +43,12 @@ pub fn render_contact_form(params: ContactFormParams<'_>) -> Result { pub base: Base<'a>, pub was_validated: bool, pub id: u16, - pub persistant_field_contents: PersistantFieldContents, + pub persistent_field_contents: PersistentFieldContents, pub captcha: String, pub error_message: &'a str, pub strings: &'a config::Strings, pub custom_fields: &'a Vec, } -/// Sucessful contact form submission template. +/// Successful contact form submission template. #[derive(Template)] #[template(path = "success.askama.html")] pub struct Success<'a> { diff --git a/templates/contact_form.askama.html b/templates/contact_form.askama.html index b6a4784..8ae34f3 100644 --- a/templates/contact_form.askama.html +++ b/templates/contact_form.askama.html @@ -16,7 +16,7 @@ @@ -26,7 +26,7 @@ @@ -35,7 +35,7 @@ {% for custom_field in custom_fields %}
- {% let value = persistant_field_contents.custom[loop.index0] %} + {% let value = persistent_field_contents.custom[loop.index0] %} {% let required = custom_field.required_feedback.is_some() %}