api changes for comment language tagging

This commit is contained in:
Felix Ableitner 2022-08-23 23:40:56 +02:00 committed by Dessalines
parent bc7450ae3e
commit d058e2217a
7 changed files with 37 additions and 58 deletions

View file

@ -1,6 +1,6 @@
use crate::sensitive::Sensitive; use crate::sensitive::Sensitive;
use lemmy_db_schema::{ use lemmy_db_schema::{
newtypes::{CommentId, CommentReportId, CommunityId, LocalUserId, PostId}, newtypes::{CommentId, CommentReportId, CommunityId, LanguageId, LocalUserId, PostId},
CommentSortType, CommentSortType,
ListingType, ListingType,
}; };
@ -12,6 +12,7 @@ pub struct CreateComment {
pub content: String, pub content: String,
pub post_id: PostId, pub post_id: PostId,
pub parent_id: Option<CommentId>, pub parent_id: Option<CommentId>,
pub language_id: Option<LanguageId>,
pub form_id: Option<String>, pub form_id: Option<String>,
pub auth: Sensitive<String>, pub auth: Sensitive<String>,
} }
@ -27,6 +28,7 @@ pub struct EditComment {
pub comment_id: CommentId, pub comment_id: CommentId,
pub content: Option<String>, pub content: Option<String>,
pub distinguished: Option<bool>, pub distinguished: Option<bool>,
pub language_id: Option<LanguageId>,
pub form_id: Option<String>, pub form_id: Option<String>,
pub auth: Sensitive<String>, pub auth: Sensitive<String>,
} }

View file

@ -84,10 +84,18 @@ impl PerformCrud for CreateComment {
} }
} }
// 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 { let comment_form = CommentForm {
content: content_slurs_removed, content: content_slurs_removed,
post_id: data.post_id, post_id: data.post_id,
creator_id: local_user_view.person.id, creator_id: local_user_view.person.id,
language_id,
..CommentForm::default() ..CommentForm::default()
}; };

View file

@ -14,7 +14,10 @@ use lemmy_apub::protocol::activities::{
create_or_update::comment::CreateOrUpdateComment, create_or_update::comment::CreateOrUpdateComment,
CreateOrUpdateType, CreateOrUpdateType,
}; };
use lemmy_db_schema::source::comment::Comment; use lemmy_db_schema::{
source::comment::{Comment, CommentForm},
traits::Crud,
};
use lemmy_db_views::structs::CommentView; use lemmy_db_views::structs::CommentView;
use lemmy_utils::{ use lemmy_utils::{
error::LemmyError, error::LemmyError,
@ -48,7 +51,6 @@ impl PerformCrud for EditComment {
CommentView::read(conn, comment_id, None) CommentView::read(conn, comment_id, None)
}) })
.await??; .await??;
let mut updated_comment = orig_comment.comment.clone();
// TODO is this necessary? It should really only need to check on create // TODO is this necessary? It should really only need to check on create
check_community_ban( check_community_ban(
@ -65,7 +67,7 @@ impl PerformCrud for EditComment {
return Err(LemmyError::from_message("no_comment_edit_allowed")); return Err(LemmyError::from_message("no_comment_edit_allowed"));
} }
if let Some(distinguished) = data.distinguished { if data.distinguished.is_some() {
// Verify that only a mod or admin can distinguish a comment // Verify that only a mod or admin can distinguish a comment
is_mod_or_admin( is_mod_or_admin(
context.pool(), context.pool(),
@ -73,24 +75,27 @@ impl PerformCrud for EditComment {
orig_comment.community.id, orig_comment.community.id,
) )
.await?; .await?;
updated_comment = blocking(context.pool(), move |conn| {
Comment::update_distinguished(conn, comment_id, distinguished)
})
.await?
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
} }
// Update the Content // Update the Content
if let Some(content) = &data.content { let content_slurs_removed = data
let content_slurs_removed = remove_slurs(content, &context.settings().slur_regex()); .content
let comment_id = data.comment_id; .as_ref()
updated_comment = blocking(context.pool(), move |conn| { .map(|c| remove_slurs(&c, &context.settings().slur_regex()));
Comment::update_content(conn, comment_id, &content_slurs_removed) let comment_id = data.comment_id;
}) let form = CommentForm {
.await? creator_id: orig_comment.comment.creator_id,
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?; post_id: orig_comment.comment.post_id,
content: content_slurs_removed.unwrap_or(orig_comment.comment.content),
distinguished: data.distinguished,
language_id: data.language_id,
..Default::default()
}; };
let updated_comment = blocking(context.pool(), move |conn| {
Comment::update(conn, comment_id, &form)
})
.await?
.map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
// Do the mentions / recipients // Do the mentions / recipients
let updated_comment_content = updated_comment.content.to_owned(); let updated_comment_content = updated_comment.content.to_owned();

View file

@ -90,7 +90,6 @@ impl PerformCrud for CreatePost {
let (embed_title, embed_description, embed_video_url) = metadata_res let (embed_title, embed_description, embed_video_url) = metadata_res
.map(|u| (Some(u.title), Some(u.description), Some(u.embed_video_url))) .map(|u| (Some(u.title), Some(u.description), Some(u.embed_video_url)))
.unwrap_or_default(); .unwrap_or_default();
let language_id = Some( let language_id = Some(
data.language_id.unwrap_or( data.language_id.unwrap_or(
blocking(context.pool(), move |conn| { blocking(context.pool(), move |conn| {

View file

@ -1,3 +1,4 @@
use crate::PerformCrud;
use actix_web::web::Data; use actix_web::web::Data;
use lemmy_api_common::{ use lemmy_api_common::{
post::{EditPost, PostResponse}, post::{EditPost, PostResponse},
@ -14,10 +15,7 @@ use lemmy_apub::protocol::activities::{
CreateOrUpdateType, CreateOrUpdateType,
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{
source::{ source::post::{Post, PostForm},
language::Language,
post::{Post, PostForm},
},
traits::Crud, traits::Crud,
utils::{diesel_option_overwrite, naive_now}, utils::{diesel_option_overwrite, naive_now},
}; };
@ -28,8 +26,6 @@ use lemmy_utils::{
}; };
use lemmy_websocket::{send::send_post_ws_message, LemmyContext, UserOperationCrud}; use lemmy_websocket::{send::send_post_ws_message, LemmyContext, UserOperationCrud};
use crate::PerformCrud;
#[async_trait::async_trait(?Send)] #[async_trait::async_trait(?Send)]
impl PerformCrud for EditPost { impl PerformCrud for EditPost {
type Response = PostResponse; type Response = PostResponse;
@ -85,15 +81,6 @@ impl PerformCrud for EditPost {
.map(|u| (Some(u.title), Some(u.description), Some(u.embed_video_url))) .map(|u| (Some(u.title), Some(u.description), Some(u.embed_video_url)))
.unwrap_or_default(); .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 { let post_form = PostForm {
creator_id: orig_post.creator_id.to_owned(), creator_id: orig_post.creator_id.to_owned(),
community_id: orig_post.community_id, community_id: orig_post.community_id,
@ -105,7 +92,7 @@ impl PerformCrud for EditPost {
embed_title, embed_title,
embed_description, embed_description,
embed_video_url, embed_video_url,
language_id, language_id: data.language_id,
thumbnail_url: Some(thumbnail_url), thumbnail_url: Some(thumbnail_url),
..PostForm::default() ..PostForm::default()
}; };

View file

@ -75,28 +75,6 @@ impl Comment {
.get_results::<Self>(conn) .get_results::<Self>(conn)
} }
pub fn update_content(
conn: &PgConnection,
comment_id: CommentId,
new_content: &str,
) -> Result<Self, Error> {
use crate::schema::comment::dsl::*;
diesel::update(comment.find(comment_id))
.set((content.eq(new_content), updated.eq(naive_now())))
.get_result::<Self>(conn)
}
pub fn update_distinguished(
conn: &PgConnection,
comment_id: CommentId,
new_distinguished: bool,
) -> Result<Self, Error> {
use crate::schema::comment::dsl::*;
diesel::update(comment.find(comment_id))
.set((distinguished.eq(new_distinguished), updated.eq(naive_now())))
.get_result::<Self>(conn)
}
pub fn create( pub fn create(
conn: &PgConnection, conn: &PgConnection,
comment_form: &CommentForm, comment_form: &CommentForm,

View file

@ -9,5 +9,5 @@ export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
# so to load the config we need to traverse to the repo root # so to load the config we need to traverse to the repo root
export LEMMY_CONFIG_LOCATION=../../config/config.hjson export LEMMY_CONFIG_LOCATION=../../config/config.hjson
RUST_BACKTRACE=1 \ RUST_BACKTRACE=1 \
cargo test -p lemmy_db_views --no-fail-fast --all-features -- --nocapture cargo test --workspace --no-fail-fast --all-features
# Add this to do printlns: -- --nocapture # Add this to do printlns: -- --nocapture