Nutomic
527eefbe92
* Use new fetcher implementation for post/comment * rewrite person fetch to use new fetcher * rewrite community to use new fetcher * rename new_fetcher to dereference_object_id * make ObjectId a newtype * handle deletion in new fetcher * rewrite apub object search to be generic * move upsert() method out of ApubObject trait * simplify ObjectId::new (and fix clippy)
380 lines
11 KiB
Rust
380 lines
11 KiB
Rust
use crate::{ApubObject, Crud, DeleteableOrRemoveable, Likeable, Saveable};
|
|
use chrono::NaiveDateTime;
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use lemmy_db_schema::{
|
|
naive_now,
|
|
source::comment::{
|
|
Comment,
|
|
CommentForm,
|
|
CommentLike,
|
|
CommentLikeForm,
|
|
CommentSaved,
|
|
CommentSavedForm,
|
|
},
|
|
CommentId,
|
|
DbUrl,
|
|
PersonId,
|
|
};
|
|
|
|
pub trait Comment_ {
|
|
fn update_ap_id(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
apub_id: DbUrl,
|
|
) -> Result<Comment, Error>;
|
|
fn permadelete_for_creator(
|
|
conn: &PgConnection,
|
|
for_creator_id: PersonId,
|
|
) -> Result<Vec<Comment>, Error>;
|
|
fn update_deleted(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_deleted: bool,
|
|
) -> Result<Comment, Error>;
|
|
fn update_removed(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_removed: bool,
|
|
) -> Result<Comment, Error>;
|
|
fn update_removed_for_creator(
|
|
conn: &PgConnection,
|
|
for_creator_id: PersonId,
|
|
new_removed: bool,
|
|
) -> Result<Vec<Comment>, Error>;
|
|
fn update_read(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_read: bool,
|
|
) -> Result<Comment, Error>;
|
|
fn update_content(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_content: &str,
|
|
) -> Result<Comment, Error>;
|
|
fn upsert(conn: &PgConnection, comment_form: &CommentForm) -> Result<Comment, Error>;
|
|
}
|
|
|
|
impl Comment_ for Comment {
|
|
fn update_ap_id(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
apub_id: DbUrl,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
|
|
diesel::update(comment.find(comment_id))
|
|
.set(ap_id.eq(apub_id))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn permadelete_for_creator(
|
|
conn: &PgConnection,
|
|
for_creator_id: PersonId,
|
|
) -> Result<Vec<Self>, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::update(comment.filter(creator_id.eq(for_creator_id)))
|
|
.set((
|
|
content.eq("*Permananently Deleted*"),
|
|
deleted.eq(true),
|
|
updated.eq(naive_now()),
|
|
))
|
|
.get_results::<Self>(conn)
|
|
}
|
|
|
|
fn update_deleted(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_deleted: bool,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::update(comment.find(comment_id))
|
|
.set((deleted.eq(new_deleted), updated.eq(naive_now())))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update_removed(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_removed: bool,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::update(comment.find(comment_id))
|
|
.set((removed.eq(new_removed), updated.eq(naive_now())))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update_removed_for_creator(
|
|
conn: &PgConnection,
|
|
for_creator_id: PersonId,
|
|
new_removed: bool,
|
|
) -> Result<Vec<Self>, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::update(comment.filter(creator_id.eq(for_creator_id)))
|
|
.set((removed.eq(new_removed), updated.eq(naive_now())))
|
|
.get_results::<Self>(conn)
|
|
}
|
|
|
|
fn update_read(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_read: bool,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::update(comment.find(comment_id))
|
|
.set(read.eq(new_read))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update_content(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
new_content: &str,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::update(comment.find(comment_id))
|
|
.set((content.eq(new_content), updated.eq(naive_now())))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn upsert(conn: &PgConnection, comment_form: &CommentForm) -> Result<Comment, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
insert_into(comment)
|
|
.values(comment_form)
|
|
.on_conflict(ap_id)
|
|
.do_update()
|
|
.set(comment_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Crud for Comment {
|
|
type Form = CommentForm;
|
|
type IdType = CommentId;
|
|
fn read(conn: &PgConnection, comment_id: CommentId) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
comment.find(comment_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn delete(conn: &PgConnection, comment_id: CommentId) -> Result<usize, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::delete(comment.find(comment_id)).execute(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, comment_form: &CommentForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
insert_into(comment)
|
|
.values(comment_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
comment_id: CommentId,
|
|
comment_form: &CommentForm,
|
|
) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
diesel::update(comment.find(comment_id))
|
|
.set(comment_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl ApubObject for Comment {
|
|
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
|
|
None
|
|
}
|
|
|
|
fn read_from_apub_id(conn: &PgConnection, object_id: &DbUrl) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment::dsl::*;
|
|
comment.filter(ap_id.eq(object_id)).first::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Likeable for CommentLike {
|
|
type Form = CommentLikeForm;
|
|
type IdType = CommentId;
|
|
fn like(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment_like::dsl::*;
|
|
insert_into(comment_like)
|
|
.values(comment_like_form)
|
|
.on_conflict((comment_id, person_id))
|
|
.do_update()
|
|
.set(comment_like_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
fn remove(
|
|
conn: &PgConnection,
|
|
person_id: PersonId,
|
|
comment_id: CommentId,
|
|
) -> Result<usize, Error> {
|
|
use lemmy_db_schema::schema::comment_like::dsl;
|
|
diesel::delete(
|
|
dsl::comment_like
|
|
.filter(dsl::comment_id.eq(comment_id))
|
|
.filter(dsl::person_id.eq(person_id)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
}
|
|
|
|
impl Saveable for CommentSaved {
|
|
type Form = CommentSavedForm;
|
|
fn save(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result<Self, Error> {
|
|
use lemmy_db_schema::schema::comment_saved::dsl::*;
|
|
insert_into(comment_saved)
|
|
.values(comment_saved_form)
|
|
.on_conflict((comment_id, person_id))
|
|
.do_update()
|
|
.set(comment_saved_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
fn unsave(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result<usize, Error> {
|
|
use lemmy_db_schema::schema::comment_saved::dsl::*;
|
|
diesel::delete(
|
|
comment_saved
|
|
.filter(comment_id.eq(comment_saved_form.comment_id))
|
|
.filter(person_id.eq(comment_saved_form.person_id)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
}
|
|
|
|
impl DeleteableOrRemoveable for Comment {
|
|
fn blank_out_deleted_or_removed_info(mut self) -> Self {
|
|
self.content = "".into();
|
|
self
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{establish_unpooled_connection, Crud, Likeable, Saveable};
|
|
use lemmy_db_schema::source::{
|
|
comment::*,
|
|
community::{Community, CommunityForm},
|
|
person::{Person, PersonForm},
|
|
post::*,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[test]
|
|
#[serial]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let new_person = PersonForm {
|
|
name: "terry".into(),
|
|
..PersonForm::default()
|
|
};
|
|
|
|
let inserted_person = Person::create(&conn, &new_person).unwrap();
|
|
|
|
let new_community = CommunityForm {
|
|
name: "test community".to_string(),
|
|
title: "nada".to_owned(),
|
|
..CommunityForm::default()
|
|
};
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
|
|
|
let new_post = PostForm {
|
|
name: "A test post".into(),
|
|
creator_id: inserted_person.id,
|
|
community_id: inserted_community.id,
|
|
..PostForm::default()
|
|
};
|
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
|
|
|
let comment_form = CommentForm {
|
|
content: "A test comment".into(),
|
|
creator_id: inserted_person.id,
|
|
post_id: inserted_post.id,
|
|
..CommentForm::default()
|
|
};
|
|
|
|
let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
|
|
|
|
let expected_comment = Comment {
|
|
id: inserted_comment.id,
|
|
content: "A test comment".into(),
|
|
creator_id: inserted_person.id,
|
|
post_id: inserted_post.id,
|
|
removed: false,
|
|
deleted: false,
|
|
read: false,
|
|
parent_id: None,
|
|
published: inserted_comment.published,
|
|
updated: None,
|
|
ap_id: inserted_comment.ap_id.to_owned(),
|
|
local: true,
|
|
};
|
|
|
|
let child_comment_form = CommentForm {
|
|
content: "A child comment".into(),
|
|
creator_id: inserted_person.id,
|
|
post_id: inserted_post.id,
|
|
parent_id: Some(inserted_comment.id),
|
|
..CommentForm::default()
|
|
};
|
|
|
|
let inserted_child_comment = Comment::create(&conn, &child_comment_form).unwrap();
|
|
|
|
// Comment Like
|
|
let comment_like_form = CommentLikeForm {
|
|
comment_id: inserted_comment.id,
|
|
post_id: inserted_post.id,
|
|
person_id: inserted_person.id,
|
|
score: 1,
|
|
};
|
|
|
|
let inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap();
|
|
|
|
let expected_comment_like = CommentLike {
|
|
id: inserted_comment_like.id,
|
|
comment_id: inserted_comment.id,
|
|
post_id: inserted_post.id,
|
|
person_id: inserted_person.id,
|
|
published: inserted_comment_like.published,
|
|
score: 1,
|
|
};
|
|
|
|
// Comment Saved
|
|
let comment_saved_form = CommentSavedForm {
|
|
comment_id: inserted_comment.id,
|
|
person_id: inserted_person.id,
|
|
};
|
|
|
|
let inserted_comment_saved = CommentSaved::save(&conn, &comment_saved_form).unwrap();
|
|
|
|
let expected_comment_saved = CommentSaved {
|
|
id: inserted_comment_saved.id,
|
|
comment_id: inserted_comment.id,
|
|
person_id: inserted_person.id,
|
|
published: inserted_comment_saved.published,
|
|
};
|
|
|
|
let read_comment = Comment::read(&conn, inserted_comment.id).unwrap();
|
|
let updated_comment = Comment::update(&conn, inserted_comment.id, &comment_form).unwrap();
|
|
let like_removed = CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap();
|
|
let saved_removed = CommentSaved::unsave(&conn, &comment_saved_form).unwrap();
|
|
let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap();
|
|
Comment::delete(&conn, inserted_child_comment.id).unwrap();
|
|
Post::delete(&conn, inserted_post.id).unwrap();
|
|
Community::delete(&conn, inserted_community.id).unwrap();
|
|
Person::delete(&conn, inserted_person.id).unwrap();
|
|
|
|
assert_eq!(expected_comment, read_comment);
|
|
assert_eq!(expected_comment, inserted_comment);
|
|
assert_eq!(expected_comment, updated_comment);
|
|
assert_eq!(expected_comment_like, inserted_comment_like);
|
|
assert_eq!(expected_comment_saved, inserted_comment_saved);
|
|
assert_eq!(
|
|
expected_comment.id,
|
|
inserted_child_comment.parent_id.unwrap()
|
|
);
|
|
assert_eq!(1, like_removed);
|
|
assert_eq!(1, saved_removed);
|
|
assert_eq!(1, num_deleted);
|
|
}
|
|
}
|