mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-16 07:07:25 +00:00
22abbebd41
- Added a shared inbox. - Added federated comments, comment updates, and tests. - Abstracted ap object sends into a common trait.
389 lines
11 KiB
Rust
389 lines
11 KiB
Rust
use super::post::Post;
|
|
use super::*;
|
|
use crate::apub::{make_apub_endpoint, EndpointType};
|
|
use crate::naive_now;
|
|
use crate::schema::{comment, comment_like, comment_saved};
|
|
|
|
// WITH RECURSIVE MyTree AS (
|
|
// SELECT * FROM comment WHERE parent_id IS NULL
|
|
// UNION ALL
|
|
// SELECT m.* FROM comment AS m JOIN MyTree AS t ON m.parent_id = t.id
|
|
// )
|
|
// SELECT * FROM MyTree;
|
|
|
|
#[derive(Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
|
#[belongs_to(Post)]
|
|
#[table_name = "comment"]
|
|
pub struct Comment {
|
|
pub id: i32,
|
|
pub creator_id: i32,
|
|
pub post_id: i32,
|
|
pub parent_id: Option<i32>,
|
|
pub content: String,
|
|
pub removed: bool,
|
|
pub read: bool,
|
|
pub published: chrono::NaiveDateTime,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub deleted: bool,
|
|
pub ap_id: String,
|
|
pub local: bool,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "comment"]
|
|
pub struct CommentForm {
|
|
pub creator_id: i32,
|
|
pub post_id: i32,
|
|
pub parent_id: Option<i32>,
|
|
pub content: String,
|
|
pub removed: Option<bool>,
|
|
pub read: Option<bool>,
|
|
pub published: Option<chrono::NaiveDateTime>,
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
pub deleted: Option<bool>,
|
|
pub ap_id: String,
|
|
pub local: bool,
|
|
}
|
|
|
|
impl Crud<CommentForm> for Comment {
|
|
fn read(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
comment.find(comment_id).first::<Self>(conn)
|
|
}
|
|
|
|
fn delete(conn: &PgConnection, comment_id: i32) -> Result<usize, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
diesel::delete(comment.find(comment_id)).execute(conn)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, comment_form: &CommentForm) -> Result<Self, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
insert_into(comment)
|
|
.values(comment_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
comment_id: i32,
|
|
comment_form: &CommentForm,
|
|
) -> Result<Self, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
diesel::update(comment.find(comment_id))
|
|
.set(comment_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
impl Comment {
|
|
pub fn update_ap_id(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
|
|
let apid = make_apub_endpoint(EndpointType::Comment, &comment_id.to_string()).to_string();
|
|
diesel::update(comment.find(comment_id))
|
|
.set(ap_id.eq(apid))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
pub fn read_from_apub_id(conn: &PgConnection, object_id: &str) -> Result<Self, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
comment.filter(ap_id.eq(object_id)).first::<Self>(conn)
|
|
}
|
|
|
|
pub fn mark_as_read(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
|
|
diesel::update(comment.find(comment_id))
|
|
.set(read.eq(true))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
|
|
pub fn permadelete(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
|
|
use crate::schema::comment::dsl::*;
|
|
|
|
diesel::update(comment.find(comment_id))
|
|
.set((
|
|
content.eq("*Permananently Deleted*"),
|
|
deleted.eq(true),
|
|
updated.eq(naive_now()),
|
|
))
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug, Clone)]
|
|
#[belongs_to(Comment)]
|
|
#[table_name = "comment_like"]
|
|
pub struct CommentLike {
|
|
pub id: i32,
|
|
pub user_id: i32,
|
|
pub comment_id: i32,
|
|
pub post_id: i32,
|
|
pub score: i16,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "comment_like"]
|
|
pub struct CommentLikeForm {
|
|
pub user_id: i32,
|
|
pub comment_id: i32,
|
|
pub post_id: i32,
|
|
pub score: i16,
|
|
}
|
|
|
|
impl Likeable<CommentLikeForm> for CommentLike {
|
|
fn read(conn: &PgConnection, comment_id_from: i32) -> Result<Vec<Self>, Error> {
|
|
use crate::schema::comment_like::dsl::*;
|
|
comment_like
|
|
.filter(comment_id.eq(comment_id_from))
|
|
.load::<Self>(conn)
|
|
}
|
|
|
|
fn like(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result<Self, Error> {
|
|
use crate::schema::comment_like::dsl::*;
|
|
insert_into(comment_like)
|
|
.values(comment_like_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
fn remove(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result<usize, Error> {
|
|
use crate::schema::comment_like::dsl::*;
|
|
diesel::delete(
|
|
comment_like
|
|
.filter(comment_id.eq(comment_like_form.comment_id))
|
|
.filter(user_id.eq(comment_like_form.user_id)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
}
|
|
|
|
impl CommentLike {
|
|
pub fn from_post(conn: &PgConnection, post_id_from: i32) -> Result<Vec<Self>, Error> {
|
|
use crate::schema::comment_like::dsl::*;
|
|
comment_like
|
|
.filter(post_id.eq(post_id_from))
|
|
.load::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
|
#[belongs_to(Comment)]
|
|
#[table_name = "comment_saved"]
|
|
pub struct CommentSaved {
|
|
pub id: i32,
|
|
pub comment_id: i32,
|
|
pub user_id: i32,
|
|
pub published: chrono::NaiveDateTime,
|
|
}
|
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
|
#[table_name = "comment_saved"]
|
|
pub struct CommentSavedForm {
|
|
pub comment_id: i32,
|
|
pub user_id: i32,
|
|
}
|
|
|
|
impl Saveable<CommentSavedForm> for CommentSaved {
|
|
fn save(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result<Self, Error> {
|
|
use crate::schema::comment_saved::dsl::*;
|
|
insert_into(comment_saved)
|
|
.values(comment_saved_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
fn unsave(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result<usize, Error> {
|
|
use crate::schema::comment_saved::dsl::*;
|
|
diesel::delete(
|
|
comment_saved
|
|
.filter(comment_id.eq(comment_saved_form.comment_id))
|
|
.filter(user_id.eq(comment_saved_form.user_id)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::super::community::*;
|
|
use super::super::post::*;
|
|
use super::super::user::*;
|
|
use super::*;
|
|
#[test]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let new_user = UserForm {
|
|
name: "terry".into(),
|
|
preferred_username: None,
|
|
password_encrypted: "nope".into(),
|
|
email: None,
|
|
matrix_user_id: None,
|
|
avatar: None,
|
|
admin: false,
|
|
banned: false,
|
|
updated: None,
|
|
show_nsfw: false,
|
|
theme: "darkly".into(),
|
|
default_sort_type: SortType::Hot as i16,
|
|
default_listing_type: ListingType::Subscribed as i16,
|
|
lang: "browser".into(),
|
|
show_avatars: true,
|
|
send_notifications_to_email: false,
|
|
actor_id: "changeme".into(),
|
|
bio: None,
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
};
|
|
|
|
let inserted_user = User_::create(&conn, &new_user).unwrap();
|
|
|
|
let new_community = CommunityForm {
|
|
name: "test community".to_string(),
|
|
title: "nada".to_owned(),
|
|
description: None,
|
|
category_id: 1,
|
|
creator_id: inserted_user.id,
|
|
removed: None,
|
|
deleted: None,
|
|
updated: None,
|
|
nsfw: false,
|
|
actor_id: "changeme".into(),
|
|
local: true,
|
|
private_key: None,
|
|
public_key: None,
|
|
last_refreshed_at: None,
|
|
published: None,
|
|
};
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
|
|
|
let new_post = PostForm {
|
|
name: "A test post".into(),
|
|
creator_id: inserted_user.id,
|
|
url: None,
|
|
body: None,
|
|
community_id: inserted_community.id,
|
|
removed: None,
|
|
deleted: None,
|
|
locked: None,
|
|
stickied: None,
|
|
updated: None,
|
|
nsfw: false,
|
|
embed_title: None,
|
|
embed_description: None,
|
|
embed_html: None,
|
|
thumbnail_url: None,
|
|
ap_id: "changeme".into(),
|
|
local: true,
|
|
published: None,
|
|
};
|
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
|
|
|
let comment_form = CommentForm {
|
|
content: "A test comment".into(),
|
|
creator_id: inserted_user.id,
|
|
post_id: inserted_post.id,
|
|
removed: None,
|
|
deleted: None,
|
|
read: None,
|
|
parent_id: None,
|
|
published: None,
|
|
updated: None,
|
|
ap_id: "changeme".into(),
|
|
local: true,
|
|
};
|
|
|
|
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_user.id,
|
|
post_id: inserted_post.id,
|
|
removed: false,
|
|
deleted: false,
|
|
read: false,
|
|
parent_id: None,
|
|
published: inserted_comment.published,
|
|
updated: None,
|
|
ap_id: "changeme".into(),
|
|
local: true,
|
|
};
|
|
|
|
let child_comment_form = CommentForm {
|
|
content: "A child comment".into(),
|
|
creator_id: inserted_user.id,
|
|
post_id: inserted_post.id,
|
|
parent_id: Some(inserted_comment.id),
|
|
removed: None,
|
|
deleted: None,
|
|
read: None,
|
|
published: None,
|
|
updated: None,
|
|
ap_id: "changeme".into(),
|
|
local: true,
|
|
};
|
|
|
|
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,
|
|
user_id: inserted_user.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,
|
|
user_id: inserted_user.id,
|
|
published: inserted_comment_like.published,
|
|
score: 1,
|
|
};
|
|
|
|
// Comment Saved
|
|
let comment_saved_form = CommentSavedForm {
|
|
comment_id: inserted_comment.id,
|
|
user_id: inserted_user.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,
|
|
user_id: inserted_user.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, &comment_like_form).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();
|
|
User_::delete(&conn, inserted_user.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);
|
|
}
|
|
}
|