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

[lemmy.git] / crates / db_schema / src / impls / local_user.rs

diff --git a/crates/db_schema/src/impls/local_user.rs b/crates/db_schema/src/impls/local_user.rs
index d2599f4ff51100fdda5605e7e7f1afe4a74c54e8..31eded1a4ce659669f38e441b2759243d7cb1634 100644 (file)
--- a/crates/db_schema/src/impls/local_user.rs
+++ b/crates/db_schema/src/impls/local_user.rs
@@ -2,8 +2,8 @@ use crate::{
   newtypes::LocalUserId,
   schema::local_user::dsl::*,
   source::{
+    actor_language::{LocalUserLanguage, SiteLanguage},
     local_user::{LocalUser, LocalUserForm},
-    local_user_language::LocalUserLanguage,
   },
   traits::Crud,
   utils::naive_now,
@@ -67,7 +67,7 @@ mod safe_settings_type {
 }
 
 impl LocalUser {
-  pub fn register(conn: &PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
+  pub fn register(conn: &mut PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
     let mut edited_user = form.clone();
     let password_hash = form
       .password_encrypted
@@ -79,7 +79,7 @@ impl LocalUser {
   }
 
   pub fn update_password(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
     local_user_id: LocalUserId,
     new_password: &str,
   ) -> Result<Self, Error> {
@@ -93,14 +93,14 @@ impl LocalUser {
       .get_result::<Self>(conn)
   }
 
-  pub fn set_all_users_email_verified(conn: &PgConnection) -> Result<Vec<Self>, Error> {
+  pub fn set_all_users_email_verified(conn: &mut PgConnection) -> Result<Vec<Self>, Error> {
     diesel::update(local_user)
       .set(email_verified.eq(true))
       .get_results::<Self>(conn)
   }
 
   pub fn set_all_users_registration_applications_accepted(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
   ) -> Result<Vec<Self>, Error> {
     diesel::update(local_user)
       .set(accepted_application.eq(true))
@@ -111,22 +111,31 @@ impl LocalUser {
 impl Crud for LocalUser {
   type Form = LocalUserForm;
   type IdType = LocalUserId;
-  fn read(conn: &PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
+  fn read(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
     local_user.find(local_user_id).first::<Self>(conn)
   }
-  fn delete(conn: &PgConnection, local_user_id: LocalUserId) -> Result<usize, Error> {
+  fn delete(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<usize, Error> {
     diesel::delete(local_user.find(local_user_id)).execute(conn)
   }
-  fn create(conn: &PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
+  fn create(conn: &mut PgConnection, form: &LocalUserForm) -> Result<Self, Error> {
     let local_user_ = insert_into(local_user)
       .values(form)
       .get_result::<Self>(conn)?;
-    // initialize with all languages
-    LocalUserLanguage::update_user_languages(conn, None, local_user_.id)?;
+
+    let site_languages = SiteLanguage::read_local(conn);
+    if let Ok(langs) = site_languages {
+      // if site exists, init user with site languages
+      LocalUserLanguage::update(conn, langs, local_user_.id)?;
+    } else {
+      // otherwise, init with all languages (this only happens during tests and
+      // for first admin user, which is created before site)
+      LocalUserLanguage::update(conn, vec![], local_user_.id)?;
+    }
+
     Ok(local_user_)
   }
   fn update(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
     local_user_id: LocalUserId,
     form: &LocalUserForm,
   ) -> Result<Self, Error> {