implement language tags for site/community in db and api (#2434)

[lemmy.git] / crates / api_crud / src / user / create.rs

diff --git a/crates/api_crud/src/user/create.rs b/crates/api_crud/src/user/create.rs
index 9fc4fe5b111c3cc86b42d1f1fd9c8996a1363617..6560783b78655e1d95fe6dac80901e5d6ac96a40 100644 (file)
--- a/crates/api_crud/src/user/create.rs
+++ b/crates/api_crud/src/user/create.rs
@@ -3,7 +3,13 @@ use activitypub_federation::core::signatures::generate_actor_keypair;
 use actix_web::web::Data;
 use lemmy_api_common::{
   person::{LoginResponse, Register},
-  utils::{blocking, honeypot_check, password_length_check, send_verification_email},
+  utils::{
+    blocking,
+    honeypot_check,
+    password_length_check,
+    send_new_applicant_email_to_admins,
+    send_verification_email,
+  },
 };
 use lemmy_apub::{
   generate_inbox_url,
@@ -15,7 +21,6 @@ use lemmy_db_schema::{
   aggregates::structs::PersonAggregates,
   source::{
     local_user::{LocalUser, LocalUserForm},
-    local_user_language::LocalUserLanguage,
     person::{Person, PersonForm},
     registration_application::{RegistrationApplication, RegistrationApplicationForm},
     site::Site,
@@ -27,7 +32,7 @@ use lemmy_db_views_actor::structs::PersonViewSafe;
 use lemmy_utils::{
   claims::Claims,
   error::LemmyError,
-  utils::{check_slurs, is_valid_actor_name},
+  utils::{check_slurs, check_slurs_opt, is_valid_actor_name},
   ConnectionId,
 };
 use lemmy_websocket::{messages::CheckCaptcha, LemmyContext};
@@ -48,7 +53,8 @@ impl PerformCrud for Register {
     let (mut email_verification, mut require_application) = (false, false);
 
     // Make sure site has open registration
-    if let Ok(site) = blocking(context.pool(), Site::read_local_site).await? {
+    let site = blocking(context.pool(), Site::read_local).await?;
+    if let Ok(site) = &site {
       if !site.open_registration {
         return Err(LemmyError::from_message("registration_closed"));
       }
@@ -100,7 +106,9 @@ impl PerformCrud for Register {
       }
     }
 
-    check_slurs(&data.username, &context.settings().slur_regex())?;
+    let slur_regex = &context.settings().slur_regex();
+    check_slurs(&data.username, slur_regex)?;
+    check_slurs_opt(&data.answer, slur_regex)?;
 
     let actor_keypair = generate_actor_keypair()?;
     if !is_valid_actor_name(&data.username, context.settings().actor_name_max_length) {
@@ -136,7 +144,7 @@ impl PerformCrud for Register {
     // Create the local user
     let local_user_form = LocalUserForm {
       person_id: Some(inserted_person.id),
-      email: Some(data.email.as_deref().map(|s| s.to_owned())),
+      email: Some(data.email.as_deref().map(|s| s.to_lowercase())),
       password_encrypted: Some(data.password.to_string()),
       show_nsfw: Some(data.show_nsfw),
       email_verified: Some(false),
@@ -168,17 +176,10 @@ impl PerformCrud for Register {
       }
     };
 
-    // Update the users languages to all by default
-    let local_user_id = inserted_local_user.id;
-    blocking(context.pool(), move |conn| {
-      LocalUserLanguage::update_user_languages(conn, None, local_user_id)
-    })
-    .await??;
-
     if require_application {
       // Create the registration application
       let form = RegistrationApplicationForm {
-        local_user_id: Some(local_user_id),
+        local_user_id: Some(inserted_local_user.id),
         // We already made sure answer was not null above
         answer: data.answer.to_owned(),
         ..RegistrationApplicationForm::default()
@@ -190,6 +191,12 @@ impl PerformCrud for Register {
       .await??;
     }
 
+    // Email the admins
+    if site.map(|s| s.application_email_admins).unwrap_or(false) {
+      send_new_applicant_email_to_admins(&data.username, context.pool(), context.settings())
+        .await?;
+    }
+
     let mut login_response = LoginResponse {
       jwt: None,
       registration_created: false,