Diesel 2.0.0 upgrade (#2452)

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

diff --git a/crates/api_crud/src/comment/create.rs b/crates/api_crud/src/comment/create.rs
index f550c0535cccb05d078f8bd98725c854490a48b1..7ab0f20b6d0b0e96a904be242185cb52763428cd 100644 (file)
--- a/crates/api_crud/src/comment/create.rs
+++ b/crates/api_crud/src/comment/create.rs
@@ -20,11 +20,11 @@ use lemmy_apub::{
 use lemmy_db_schema::{
   source::{
     comment::{Comment, CommentForm, CommentLike, CommentLikeForm},
+    comment_reply::CommentReply,
     person_mention::PersonMention,
   },
   traits::{Crud, Likeable},
 };
-use lemmy_db_views::structs::CommentView;
 use lemmy_utils::{
   error::LemmyError,
   utils::{remove_slurs, scrape_text_for_mentions},
@@ -67,31 +67,43 @@ impl PerformCrud for CreateComment {
       return Err(LemmyError::from_message("locked"));
     }
 
-    // If there's a parent_id, check to make sure that comment is in that post
-    if let Some(parent_id) = data.parent_id {
-      // Make sure the parent comment exists
-      let parent = blocking(context.pool(), move |conn| Comment::read(conn, parent_id))
+    // Fetch the parent, if it exists
+    let parent_opt = if let Some(parent_id) = data.parent_id {
+      blocking(context.pool(), move |conn| Comment::read(conn, parent_id))
         .await?
-        .map_err(|e| LemmyError::from_error_message(e, "couldnt_create_comment"))?;
+        .ok()
+    } else {
+      None
+    };
 
-      // Strange issue where sometimes the post ID is incorrect
+    // If there's a parent_id, check to make sure that comment is in that post
+    // Strange issue where sometimes the post ID of the parent comment is incorrect
+    if let Some(parent) = parent_opt.as_ref() {
       if parent.post_id != post_id {
         return Err(LemmyError::from_message("couldnt_create_comment"));
       }
     }
 
+    // if no language is set, copy language from parent post/comment
+    let parent_language = parent_opt
+      .as_ref()
+      .map(|p| p.language_id)
+      .unwrap_or(post.language_id);
+    let language_id = Some(data.language_id.unwrap_or(parent_language));
+
     let comment_form = CommentForm {
       content: content_slurs_removed,
-      parent_id: data.parent_id.to_owned(),
       post_id: data.post_id,
       creator_id: local_user_view.person.id,
+      language_id,
       ..CommentForm::default()
     };
 
     // Create the comment
     let comment_form2 = comment_form.clone();
+    let parent_path = parent_opt.to_owned().map(|t| t.path);
     let inserted_comment = blocking(context.pool(), move |conn| {
-      Comment::create(conn, &comment_form2)
+      Comment::create(conn, &comment_form2, parent_path.as_ref())
     })
     .await?
     .map_err(|e| LemmyError::from_error_message(e, "couldnt_create_comment"))?;
@@ -133,7 +145,7 @@ impl PerformCrud for CreateComment {
       score: 1,
     };
 
-    let like = move |conn: &'_ _| CommentLike::like(conn, &like_form);
+    let like = move |conn: &mut _| CommentLike::like(conn, &like_form);
     blocking(context.pool(), like)
       .await?
       .map_err(|e| LemmyError::from_error_message(e, "couldnt_like_comment"))?;
@@ -148,35 +160,21 @@ impl PerformCrud for CreateComment {
     )
     .await?;
 
-    let person_id = local_user_view.person.id;
-    let comment_id = inserted_comment.id;
-    let comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, comment_id, Some(person_id))
-    })
-    .await??;
-
-    // If its a comment to yourself, mark it as read
-    if local_user_view.person.id == comment_view.get_recipient_id() {
-      let comment_id = inserted_comment.id;
-      blocking(context.pool(), move |conn| {
-        Comment::update_read(conn, comment_id, true)
-      })
-      .await?
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
-    }
     // If its a reply, mark the parent as read
-    if let Some(parent_id) = data.parent_id {
-      let parent_comment = blocking(context.pool(), move |conn| {
-        CommentView::read(conn, parent_id, Some(person_id))
+    if let Some(parent) = parent_opt {
+      let parent_id = parent.id;
+      let comment_reply = blocking(context.pool(), move |conn| {
+        CommentReply::read_by_comment(conn, parent_id)
       })
-      .await??;
-      if local_user_view.person.id == parent_comment.get_recipient_id() {
+      .await?;
+      if let Ok(reply) = comment_reply {
         blocking(context.pool(), move |conn| {
-          Comment::update_read(conn, parent_id, true)
+          CommentReply::update_read(conn, reply.id, true)
         })
         .await?
-        .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_parent_comment"))?;
+        .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_replies"))?;
       }
+
       // If the parent has PersonMentions mark them as read too
       let person_id = local_user_view.person.id;
       let person_mention = blocking(context.pool(), move |conn| {