Diesel 2.0.0 upgrade (#2452)

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

diff --git a/crates/api_crud/src/post/create.rs b/crates/api_crud/src/post/create.rs
index 9151e3ba1c636fd4fc87e903288b40100028b0c1..0d4271a80bde6cf9dedbcb0d70d34e0cf8252cbe 100644 (file)
--- a/crates/api_crud/src/post/create.rs
+++ b/crates/api_crud/src/post/create.rs
@@ -21,20 +21,16 @@ use lemmy_apub::{
 use lemmy_db_schema::{
   source::{
     community::Community,
+    language::Language,
     post::{Post, PostForm, PostLike, PostLikeForm},
   },
   traits::{Crud, Likeable},
+  utils::diesel_option_overwrite,
 };
 use lemmy_db_views_actor::structs::CommunityView;
 use lemmy_utils::{
   error::LemmyError,
-  utils::{
-    check_slurs,
-    check_slurs_opt,
-    clean_optional_text,
-    clean_url_params,
-    is_valid_post_title,
-  },
+  utils::{check_slurs, check_slurs_opt, clean_url_params, is_valid_post_title},
   ConnectionId,
 };
 use lemmy_websocket::{send::send_post_ws_message, LemmyContext, UserOperationCrud};
@@ -61,6 +57,10 @@ impl PerformCrud for CreatePost {
     check_slurs_opt(&data.body, slur_regex)?;
     honeypot_check(&data.honeypot)?;
 
+    let data_url = data.url.as_ref();
+    let url = Some(data_url.map(clean_url_params).map(Into::into)); // TODO no good way to handle a "clear"
+    let body = diesel_option_overwrite(&data.body);
+
     if !is_valid_post_title(&data.name) {
       return Err(LemmyError::from_message("invalid_post_title"));
     }
@@ -85,24 +85,32 @@ impl PerformCrud for CreatePost {
     }
 
     // Fetch post links and pictrs cached image
-    let data_url = data.url.as_ref();
     let (metadata_res, thumbnail_url) =
-      fetch_site_data(context.client(), &context.settings(), data_url).await;
+      fetch_site_data(context.client(), context.settings(), data_url).await;
     let (embed_title, embed_description, embed_video_url) = metadata_res
-      .map(|u| (u.title, u.description, u.embed_video_url))
+      .map(|u| (Some(u.title), Some(u.description), Some(u.embed_video_url)))
       .unwrap_or_default();
+    let language_id = Some(
+      data.language_id.unwrap_or(
+        blocking(context.pool(), move |conn| {
+          Language::read_undetermined(conn)
+        })
+        .await??,
+      ),
+    );
 
     let post_form = PostForm {
       name: data.name.trim().to_owned(),
-      url: data_url.map(|u| clean_url_params(u.to_owned()).into()),
-      body: clean_optional_text(&data.body),
+      url,
+      body,
       community_id: data.community_id,
       creator_id: local_user_view.person.id,
       nsfw: data.nsfw,
       embed_title,
       embed_description,
       embed_video_url,
-      thumbnail_url,
+      language_id,
+      thumbnail_url: Some(thumbnail_url),
       ..PostForm::default()
     };
 
@@ -142,7 +150,7 @@ impl PerformCrud for CreatePost {
       score: 1,
     };
 
-    let like = move |conn: &'_ _| PostLike::like(conn, &like_form);
+    let like = move |conn: &mut _| PostLike::like(conn, &like_form);
     blocking(context.pool(), like)
       .await?
       .map_err(|e| LemmyError::from_error_message(e, "couldnt_like_post"))?;