|
|
|
@ -48,44 +48,14 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
let new_person = PersonForm {
|
|
|
|
|
name: "thommy_community_agg".into(),
|
|
|
|
|
preferred_username: None,
|
|
|
|
|
avatar: None,
|
|
|
|
|
banner: None,
|
|
|
|
|
banned: None,
|
|
|
|
|
deleted: None,
|
|
|
|
|
published: None,
|
|
|
|
|
updated: None,
|
|
|
|
|
actor_id: None,
|
|
|
|
|
bio: None,
|
|
|
|
|
local: None,
|
|
|
|
|
private_key: None,
|
|
|
|
|
public_key: None,
|
|
|
|
|
last_refreshed_at: None,
|
|
|
|
|
inbox_url: None,
|
|
|
|
|
shared_inbox_url: None,
|
|
|
|
|
matrix_user_id: None,
|
|
|
|
|
..PersonForm::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let inserted_person = Person::create(&conn, &new_person).unwrap();
|
|
|
|
|
|
|
|
|
|
let another_person = PersonForm {
|
|
|
|
|
name: "jerry_community_agg".into(),
|
|
|
|
|
preferred_username: None,
|
|
|
|
|
avatar: None,
|
|
|
|
|
banner: None,
|
|
|
|
|
banned: None,
|
|
|
|
|
deleted: None,
|
|
|
|
|
published: None,
|
|
|
|
|
updated: None,
|
|
|
|
|
actor_id: None,
|
|
|
|
|
bio: None,
|
|
|
|
|
local: None,
|
|
|
|
|
private_key: None,
|
|
|
|
|
public_key: None,
|
|
|
|
|
last_refreshed_at: None,
|
|
|
|
|
inbox_url: None,
|
|
|
|
|
shared_inbox_url: None,
|
|
|
|
|
matrix_user_id: None,
|
|
|
|
|
..PersonForm::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let another_inserted_person = Person::create(&conn, &another_person).unwrap();
|
|
|
|
@ -94,22 +64,7 @@ mod tests {
|
|
|
|
|
name: "TIL_community_agg".into(),
|
|
|
|
|
creator_id: inserted_person.id,
|
|
|
|
|
title: "nada".to_owned(),
|
|
|
|
|
description: None,
|
|
|
|
|
nsfw: false,
|
|
|
|
|
removed: None,
|
|
|
|
|
deleted: None,
|
|
|
|
|
updated: None,
|
|
|
|
|
actor_id: None,
|
|
|
|
|
local: true,
|
|
|
|
|
private_key: None,
|
|
|
|
|
public_key: None,
|
|
|
|
|
last_refreshed_at: None,
|
|
|
|
|
published: None,
|
|
|
|
|
icon: None,
|
|
|
|
|
banner: None,
|
|
|
|
|
followers_url: None,
|
|
|
|
|
inbox_url: None,
|
|
|
|
|
shared_inbox_url: None,
|
|
|
|
|
..CommunityForm::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
|
|
|
@ -118,22 +73,7 @@ mod tests {
|
|
|
|
|
name: "TIL_community_agg_2".into(),
|
|
|
|
|
creator_id: inserted_person.id,
|
|
|
|
|
title: "nada".to_owned(),
|
|
|
|
|
description: None,
|
|
|
|
|
nsfw: false,
|
|
|
|
|
removed: None,
|
|
|
|
|
deleted: None,
|
|
|
|
|
updated: None,
|
|
|
|
|
actor_id: None,
|
|
|
|
|
local: true,
|
|
|
|
|
private_key: None,
|
|
|
|
|
public_key: None,
|
|
|
|
|
last_refreshed_at: None,
|
|
|
|
|
published: None,
|
|
|
|
|
icon: None,
|
|
|
|
|
banner: None,
|
|
|
|
|
followers_url: None,
|
|
|
|
|
inbox_url: None,
|
|
|
|
|
shared_inbox_url: None,
|
|
|
|
|
..CommunityForm::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let another_inserted_community = Community::create(&conn, &another_community).unwrap();
|
|
|
|
@ -164,23 +104,9 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
let new_post = PostForm {
|
|
|
|
|
name: "A test post".into(),
|
|
|
|
|
url: None,
|
|
|
|
|
body: None,
|
|
|
|
|
creator_id: inserted_person.id,
|
|
|
|
|
community_id: inserted_community.id,
|
|
|
|
|
removed: None,
|
|
|
|
|
deleted: None,
|
|
|
|
|
locked: None,
|
|
|
|
|
stickied: None,
|
|
|
|
|
nsfw: false,
|
|
|
|
|
updated: None,
|
|
|
|
|
embed_title: None,
|
|
|
|
|
embed_description: None,
|
|
|
|
|
embed_html: None,
|
|
|
|
|
thumbnail_url: None,
|
|
|
|
|
ap_id: None,
|
|
|
|
|
local: true,
|
|
|
|
|
published: None,
|
|
|
|
|
..PostForm::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
|
|
|
@ -189,14 +115,7 @@ mod tests {
|
|
|
|
|
content: "A test comment".into(),
|
|
|
|
|
creator_id: inserted_person.id,
|
|
|
|
|
post_id: inserted_post.id,
|
|
|
|
|
removed: None,
|
|
|
|
|
deleted: None,
|
|
|
|
|
read: None,
|
|
|
|
|
parent_id: None,
|
|
|
|
|
published: None,
|
|
|
|
|
updated: None,
|
|
|
|
|
ap_id: None,
|
|
|
|
|
local: true,
|
|
|
|
|
..CommentForm::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
|
|
|
|
@ -205,14 +124,8 @@ mod tests {
|
|
|
|
|
content: "A test comment".into(),
|
|
|
|
|
creator_id: inserted_person.id,
|
|
|
|
|
post_id: inserted_post.id,
|
|
|
|
|
removed: None,
|
|
|
|
|
deleted: None,
|
|
|
|
|
read: None,
|
|
|
|
|
parent_id: Some(inserted_comment.id),
|
|
|
|
|
published: None,
|
|
|
|
|
updated: None,
|
|
|
|
|
ap_id: None,
|
|
|
|
|
local: true,
|
|
|
|
|
..CommentForm::default()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let _inserted_child_comment = Comment::create(&conn, &child_comment_form).unwrap();
|
|
|
|
|