Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / api_common / src / utils.rs

diff --git a/crates/api_common/src/utils.rs b/crates/api_common/src/utils.rs
index bf99b7b94eba962fac1869e910cb4e7c8a668343..ce6831e398fe17bc7dd310f3f85a91a8b5023b0c 100644 (file)
--- a/crates/api_common/src/utils.rs
+++ b/crates/api_common/src/utils.rs
@@ -42,21 +42,19 @@ use tracing::warn;
 
 pub async fn blocking<F, T>(pool: &DbPool, f: F) -> Result<T, LemmyError>
 where
-  F: FnOnce(&diesel::PgConnection) -> T + Send + 'static,
+  F: FnOnce(&mut diesel::PgConnection) -> T + Send + 'static,
   T: Send + 'static,
 {
   let pool = pool.clone();
   let blocking_span = tracing::info_span!("blocking operation");
-  let res = actix_web::web::block(move || {
+  actix_web::web::block(move || {
     let entered = blocking_span.enter();
-    let conn = pool.get()?;
-    let res = (f)(&conn);
+    let mut conn = pool.get()?;
+    let res = (f)(&mut conn);
     drop(entered);
     Ok(res) as Result<T, LemmyError>
   })
-  .await?;
-
-  res
+  .await?
 }
 
 #[tracing::instrument(skip_all)]
@@ -221,7 +219,7 @@ pub async fn check_community_ban(
   pool: &DbPool,
 ) -> Result<(), LemmyError> {
   let is_banned =
-    move |conn: &'_ _| CommunityPersonBanView::get(conn, person_id, community_id).is_ok();
+    move |conn: &mut _| CommunityPersonBanView::get(conn, person_id, community_id).is_ok();
   if blocking(pool, is_banned).await? {
     Err(LemmyError::from_message("community_ban"))
   } else {
@@ -258,7 +256,7 @@ pub async fn check_person_block(
   potential_blocker_id: PersonId,
   pool: &DbPool,
 ) -> Result<(), LemmyError> {
-  let is_blocked = move |conn: &'_ _| PersonBlock::read(conn, potential_blocker_id, my_id).is_ok();
+  let is_blocked = move |conn: &mut _| PersonBlock::read(conn, potential_blocker_id, my_id).is_ok();
   if blocking(pool, is_blocked).await? {
     Err(LemmyError::from_message("person_block"))
   } else {
@@ -407,7 +405,7 @@ pub async fn send_password_reset_email(
   .await??;
 
   let email = &user.local_user.email.to_owned().expect("email");
-  let lang = get_user_lang(user);
+  let lang = get_interface_language(user);
   let subject = &lang.password_reset_subject(&user.person.name);
   let protocol_and_hostname = settings.get_protocol_and_hostname();
   let reset_link = format!("{}/password_change/{}", protocol_and_hostname, &token);
@@ -434,7 +432,7 @@ pub async fn send_verification_email(
   );
   blocking(pool, move |conn| EmailVerification::create(conn, &form)).await??;
 
-  let lang = get_user_lang(user);
+  let lang = get_interface_language(user);
   let subject = lang.verify_email_subject(&settings.hostname);
   let body = lang.verify_email_body(&settings.hostname, &user.person.name, verify_link);
   send_email(&subject, new_email, &user.person.name, &body, settings)?;
@@ -447,14 +445,14 @@ pub fn send_email_verification_success(
   settings: &Settings,
 ) -> Result<(), LemmyError> {
   let email = &user.local_user.email.to_owned().expect("email");
-  let lang = get_user_lang(user);
+  let lang = get_interface_language(user);
   let subject = &lang.email_verified_subject(&user.person.actor_id);
   let body = &lang.email_verified_body();
   send_email(subject, email, &user.person.name, body, settings)
 }
 
-pub fn get_user_lang(user: &LocalUserView) -> Lang {
-  let user_lang = LanguageId::new(user.local_user.lang.clone());
+pub fn get_interface_language(user: &LocalUserView) -> Lang {
+  let user_lang = LanguageId::new(user.local_user.interface_language.clone());
   Lang::from_language_id(&user_lang).unwrap_or_else(|| {
     let en = LanguageId::new("en");
     Lang::from_language_id(&en).expect("default language")
@@ -466,7 +464,7 @@ pub fn send_application_approved_email(
   settings: &Settings,
 ) -> Result<(), LemmyError> {
   let email = &user.local_user.email.to_owned().expect("email");
-  let lang = get_user_lang(user);
+  let lang = get_interface_language(user);
   let subject = lang.registration_approved_subject(&user.person.actor_id);
   let body = lang.registration_approved_body(&settings.hostname);
   send_email(&subject, email, &user.person.name, &body, settings)
@@ -488,7 +486,7 @@ pub async fn check_registration_application(
     })
     .await??;
     if let Some(deny_reason) = registration.deny_reason {
-      let lang = get_user_lang(local_user_view);
+      let lang = get_interface_language(local_user_view);
       let registration_denied_message = format!("{}: {}", lang.registration_denied(), &deny_reason);
       return Err(LemmyError::from_message(&registration_denied_message));
     } else {
@@ -521,7 +519,7 @@ pub async fn purge_image_posts_for_person(
   settings: &Settings,
   client: &ClientWithMiddleware,
 ) -> Result<(), LemmyError> {
-  let posts = blocking(pool, move |conn: &'_ _| {
+  let posts = blocking(pool, move |conn: &mut _| {
     Post::fetch_pictrs_posts_for_creator(conn, banned_person_id)
   })
   .await??;
@@ -550,7 +548,7 @@ pub async fn purge_image_posts_for_community(
   settings: &Settings,
   client: &ClientWithMiddleware,
 ) -> Result<(), LemmyError> {
-  let posts = blocking(pool, move |conn: &'_ _| {
+  let posts = blocking(pool, move |conn: &mut _| {
     Post::fetch_pictrs_posts_for_community(conn, banned_community_id)
   })
   .await??;
@@ -599,7 +597,7 @@ pub async fn remove_user_data(
   .await??;
 
   // Posts
-  blocking(pool, move |conn: &'_ _| {
+  blocking(pool, move |conn: &mut _| {
     Post::update_removed_for_creator(conn, banned_person_id, None, true)
   })
   .await??;
@@ -610,7 +608,7 @@ pub async fn remove_user_data(
   // Communities
   // Remove all communities where they're the top mod
   // for now, remove the communities manually
-  let first_mod_communities = blocking(pool, move |conn: &'_ _| {
+  let first_mod_communities = blocking(pool, move |conn: &mut _| {
     CommunityModeratorView::get_community_first_mods(conn)
   })
   .await??;
@@ -623,7 +621,7 @@ pub async fn remove_user_data(
 
   for first_mod_community in banned_user_first_communities {
     let community_id = first_mod_community.community.id;
-    blocking(pool, move |conn: &'_ _| {
+    blocking(pool, move |conn: &mut _| {
       Community::update_removed(conn, community_id, true)
     })
     .await??;
@@ -645,7 +643,7 @@ pub async fn remove_user_data(
   }
 
   // Comments
-  blocking(pool, move |conn: &'_ _| {
+  blocking(pool, move |conn: &mut _| {
     Comment::update_removed_for_creator(conn, banned_person_id, true)
   })
   .await??;
@@ -709,13 +707,13 @@ pub async fn delete_user_account(
   // No need to update avatar and banner, those are handled in Person::delete_account
 
   // Comments
-  let permadelete = move |conn: &'_ _| Comment::permadelete_for_creator(conn, person_id);
+  let permadelete = move |conn: &mut _| Comment::permadelete_for_creator(conn, person_id);
   blocking(pool, permadelete)
     .await?
     .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
 
   // Posts
-  let permadelete = move |conn: &'_ _| Post::permadelete_for_creator(conn, person_id);
+  let permadelete = move |conn: &mut _| Post::permadelete_for_creator(conn, person_id);
   blocking(pool, permadelete)
     .await?
     .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_post"))?;