use crate::structs::CommentView;
-use diesel::{dsl::*, result::Error, *};
+use diesel::{
+ dsl::now,
+ result::Error,
+ BoolExpressionMethods,
+ ExpressionMethods,
+ JoinOnDsl,
+ NullableExpressionMethods,
+ PgTextExpressionMethods,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
use diesel_ltree::{nlevel, subpath, Ltree, LtreeExtensions};
use lemmy_db_schema::{
aggregates::structs::CommentAggregates,
community_block,
community_follower,
community_person_ban,
- language,
local_user_language,
person,
person_block,
post::Post,
},
traits::{ToSafe, ViewToVec},
- utils::{functions::hot_rank, fuzzy_search, limit_and_offset_unlimited},
+ utils::{functions::hot_rank, fuzzy_search, get_conn, limit_and_offset_unlimited, DbPool},
CommentSortType,
ListingType,
};
);
impl CommentView {
- pub fn read(
- conn: &PgConnection,
+ pub async fn read(
+ pool: &DbPool,
comment_id: CommentId,
my_person_id: Option<PersonId>,
) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
+
// The left join below will return None in this case
let person_id_join = my_person_id.unwrap_or(PersonId(-1));
person_block::all_columns.nullable(),
comment_like::score.nullable(),
))
- .first::<CommentViewTuple>(conn)?;
+ .first::<CommentViewTuple>(conn)
+ .await?;
// If a person is given, then my_vote, if None, should be 0, not null
// Necessary to differentiate between other person's votes
#[builder(field_defaults(default))]
pub struct CommentQuery<'a> {
#[builder(!default)]
- conn: &'a PgConnection,
+ pool: &'a DbPool,
listing_type: Option<ListingType>,
sort: Option<CommentSortType>,
community_id: Option<CommunityId>,
local_user: Option<&'a LocalUser>,
search_term: Option<String>,
saved_only: Option<bool>,
+ show_deleted_and_removed: Option<bool>,
page: Option<i64>,
limit: Option<i64>,
max_depth: Option<i32>,
}
impl<'a> CommentQuery<'a> {
- pub fn list(self) -> Result<Vec<CommentView>, Error> {
- use diesel::dsl::*;
+ pub async fn list(self) -> Result<Vec<CommentView>, Error> {
+ let conn = &mut get_conn(self.pool).await?;
// The left join below will return None in this case
let person_id_join = self.local_user.map(|l| l.person_id).unwrap_or(PersonId(-1));
.and(comment_like::person_id.eq(person_id_join)),
),
)
- .inner_join(language::table)
.left_join(
local_user_language::table.on(
comment::language_id
}
if self.saved_only.unwrap_or(false) {
- query = query.filter(comment_saved::id.is_not_null());
+ query = query.filter(comment_saved::comment_id.is_not_null());
+ }
+
+ if !self.show_deleted_and_removed.unwrap_or(true) {
+ query = query.filter(comment::deleted.eq(false));
+ query = query.filter(comment::removed.eq(false));
}
if !self.local_user.map(|l| l.show_bot_accounts).unwrap_or(true) {
if self.local_user.is_some() {
// Filter out the rows with missing languages
- query = query.filter(local_user_language::id.is_not_null());
+ query = query.filter(local_user_language::language_id.is_not_null());
// Don't show blocked communities or persons
query = query.filter(community_block::person_id.is_null());
let res = query
.limit(limit)
.offset(offset)
- .load::<CommentViewTuple>(self.conn)?;
+ .load::<CommentViewTuple>(conn)
+ .await?;
Ok(CommentView::from_tuple_to_vec(res))
}
#[cfg(test)]
mod tests {
- use crate::comment_view::*;
+ use crate::comment_view::{
+ Comment,
+ CommentQuery,
+ CommentSortType,
+ CommentView,
+ Community,
+ CommunitySafe,
+ DbPool,
+ LocalUser,
+ Person,
+ PersonBlock,
+ PersonSafe,
+ Post,
+ };
use lemmy_db_schema::{
aggregates::structs::CommentAggregates,
newtypes::LanguageId,
source::{
- comment::*,
- community::*,
+ actor_language::LocalUserLanguage,
+ comment::{CommentInsertForm, CommentLike, CommentLikeForm},
+ community::CommunityInsertForm,
+ instance::Instance,
language::Language,
- local_user::LocalUserForm,
- local_user_language::LocalUserLanguage,
- person::*,
+ local_user::LocalUserInsertForm,
+ person::PersonInsertForm,
person_block::PersonBlockForm,
- post::*,
+ post::PostInsertForm,
},
traits::{Blockable, Crud, Likeable},
- utils::establish_unpooled_connection,
+ utils::build_db_pool_for_tests,
SubscribedType,
};
use serial_test::serial;
struct Data {
+ inserted_instance: Instance,
inserted_comment_0: Comment,
inserted_comment_1: Comment,
inserted_comment_2: Comment,
inserted_community: Community,
}
- fn init_data(conn: &PgConnection) -> Data {
- let new_person = PersonForm {
- name: "timmy".into(),
- public_key: Some("pubkey".to_string()),
- ..PersonForm::default()
- };
- let inserted_person = Person::create(conn, &new_person).unwrap();
- let local_user_form = LocalUserForm {
- person_id: Some(inserted_person.id),
- password_encrypted: Some("".to_string()),
- ..Default::default()
- };
- let inserted_local_user = LocalUser::create(conn, &local_user_form).unwrap();
-
- let new_person_2 = PersonForm {
- name: "sara".into(),
- public_key: Some("pubkey".to_string()),
- ..PersonForm::default()
- };
- let inserted_person_2 = Person::create(conn, &new_person_2).unwrap();
-
- let new_community = CommunityForm {
- name: "test community 5".to_string(),
- title: "nada".to_owned(),
- public_key: Some("pubkey".to_string()),
- ..CommunityForm::default()
- };
-
- let inserted_community = Community::create(conn, &new_community).unwrap();
-
- let new_post = PostForm {
- name: "A test post 2".into(),
- creator_id: inserted_person.id,
- community_id: inserted_community.id,
- ..PostForm::default()
- };
-
- let inserted_post = Post::create(conn, &new_post).unwrap();
+ async fn init_data(pool: &DbPool) -> Data {
+ let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap();
+
+ let new_person = PersonInsertForm::builder()
+ .name("timmy".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
+ let inserted_person = Person::create(pool, &new_person).await.unwrap();
+ let local_user_form = LocalUserInsertForm::builder()
+ .person_id(inserted_person.id)
+ .password_encrypted(String::new())
+ .build();
+ let inserted_local_user = LocalUser::create(pool, &local_user_form).await.unwrap();
+
+ let new_person_2 = PersonInsertForm::builder()
+ .name("sara".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
+ let inserted_person_2 = Person::create(pool, &new_person_2).await.unwrap();
+
+ let new_community = CommunityInsertForm::builder()
+ .name("test community 5".to_string())
+ .title("nada".to_owned())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
+
+ let inserted_community = Community::create(pool, &new_community).await.unwrap();
+
+ let new_post = PostInsertForm::builder()
+ .name("A test post 2".into())
+ .creator_id(inserted_person.id)
+ .community_id(inserted_community.id)
+ .build();
+
+ let inserted_post = Post::create(pool, &new_post).await.unwrap();
// Create a comment tree with this hierarchy
// 0
// 3 4
// \
// 5
- let comment_form_0 = CommentForm {
- content: "Comment 0".into(),
- creator_id: inserted_person.id,
- post_id: inserted_post.id,
- ..CommentForm::default()
- };
-
- let inserted_comment_0 = Comment::create(conn, &comment_form_0, None).unwrap();
-
- let comment_form_1 = CommentForm {
- content: "Comment 1, A test blocked comment".into(),
- creator_id: inserted_person_2.id,
- post_id: inserted_post.id,
- ..CommentForm::default()
- };
-
- let inserted_comment_1 =
- Comment::create(conn, &comment_form_1, Some(&inserted_comment_0.path)).unwrap();
-
- let finnish_id = Language::read_id_from_code(conn, "fi").unwrap();
- let comment_form_2 = CommentForm {
- content: "Comment 2".into(),
- creator_id: inserted_person.id,
- post_id: inserted_post.id,
- language_id: Some(finnish_id),
- ..CommentForm::default()
- };
+ let comment_form_0 = CommentInsertForm::builder()
+ .content("Comment 0".into())
+ .creator_id(inserted_person.id)
+ .post_id(inserted_post.id)
+ .build();
+
+ let inserted_comment_0 = Comment::create(pool, &comment_form_0, None).await.unwrap();
+
+ let comment_form_1 = CommentInsertForm::builder()
+ .content("Comment 1, A test blocked comment".into())
+ .creator_id(inserted_person_2.id)
+ .post_id(inserted_post.id)
+ .build();
+
+ let inserted_comment_1 = Comment::create(pool, &comment_form_1, Some(&inserted_comment_0.path))
+ .await
+ .unwrap();
- let inserted_comment_2 =
- Comment::create(conn, &comment_form_2, Some(&inserted_comment_0.path)).unwrap();
+ let finnish_id = Language::read_id_from_code(pool, Some("fi"))
+ .await
+ .unwrap()
+ .unwrap();
+ let comment_form_2 = CommentInsertForm::builder()
+ .content("Comment 2".into())
+ .creator_id(inserted_person.id)
+ .post_id(inserted_post.id)
+ .language_id(Some(finnish_id))
+ .build();
+
+ let inserted_comment_2 = Comment::create(pool, &comment_form_2, Some(&inserted_comment_0.path))
+ .await
+ .unwrap();
- let comment_form_3 = CommentForm {
- content: "Comment 3".into(),
- creator_id: inserted_person.id,
- post_id: inserted_post.id,
- ..CommentForm::default()
- };
+ let comment_form_3 = CommentInsertForm::builder()
+ .content("Comment 3".into())
+ .creator_id(inserted_person.id)
+ .post_id(inserted_post.id)
+ .build();
let _inserted_comment_3 =
- Comment::create(conn, &comment_form_3, Some(&inserted_comment_1.path)).unwrap();
+ Comment::create(pool, &comment_form_3, Some(&inserted_comment_1.path))
+ .await
+ .unwrap();
- let polish_id = Language::read_id_from_code(conn, "pl").unwrap();
- let comment_form_4 = CommentForm {
- content: "Comment 4".into(),
- creator_id: inserted_person.id,
- post_id: inserted_post.id,
- language_id: Some(polish_id),
- ..CommentForm::default()
- };
-
- let inserted_comment_4 =
- Comment::create(conn, &comment_form_4, Some(&inserted_comment_1.path)).unwrap();
+ let polish_id = Language::read_id_from_code(pool, Some("pl"))
+ .await
+ .unwrap()
+ .unwrap();
+ let comment_form_4 = CommentInsertForm::builder()
+ .content("Comment 4".into())
+ .creator_id(inserted_person.id)
+ .post_id(inserted_post.id)
+ .language_id(Some(polish_id))
+ .build();
+
+ let inserted_comment_4 = Comment::create(pool, &comment_form_4, Some(&inserted_comment_1.path))
+ .await
+ .unwrap();
- let comment_form_5 = CommentForm {
- content: "Comment 5".into(),
- creator_id: inserted_person.id,
- post_id: inserted_post.id,
- ..CommentForm::default()
- };
+ let comment_form_5 = CommentInsertForm::builder()
+ .content("Comment 5".into())
+ .creator_id(inserted_person.id)
+ .post_id(inserted_post.id)
+ .build();
let _inserted_comment_5 =
- Comment::create(conn, &comment_form_5, Some(&inserted_comment_4.path)).unwrap();
+ Comment::create(pool, &comment_form_5, Some(&inserted_comment_4.path))
+ .await
+ .unwrap();
let timmy_blocks_sara_form = PersonBlockForm {
person_id: inserted_person.id,
target_id: inserted_person_2.id,
};
- let inserted_block = PersonBlock::block(conn, &timmy_blocks_sara_form).unwrap();
+ let inserted_block = PersonBlock::block(pool, &timmy_blocks_sara_form)
+ .await
+ .unwrap();
let expected_block = PersonBlock {
id: inserted_block.id,
score: 1,
};
- let _inserted_comment_like = CommentLike::like(conn, &comment_like_form).unwrap();
+ let _inserted_comment_like = CommentLike::like(pool, &comment_like_form).await.unwrap();
Data {
+ inserted_instance,
inserted_comment_0,
inserted_comment_1,
inserted_comment_2,
}
}
- #[test]
+ #[tokio::test]
#[serial]
- fn test_crud() {
- let conn = establish_unpooled_connection();
- let data = init_data(&conn);
+ async fn test_crud() {
+ let pool = &build_db_pool_for_tests().await;
+ let data = init_data(pool).await;
- let expected_comment_view_no_person = expected_comment_view(&data, &conn);
+ let expected_comment_view_no_person = expected_comment_view(&data, pool).await;
- let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned();
+ let mut expected_comment_view_with_person = expected_comment_view_no_person.clone();
expected_comment_view_with_person.my_vote = Some(1);
let read_comment_views_no_person = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.post_id(Some(data.inserted_post.id))
.build()
.list()
+ .await
.unwrap();
assert_eq!(
);
let read_comment_views_with_person = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.post_id(Some(data.inserted_post.id))
.local_user(Some(&data.inserted_local_user))
.build()
.list()
+ .await
.unwrap();
assert_eq!(
assert_eq!(5, read_comment_views_with_person.len());
let read_comment_from_blocked_person = CommentView::read(
- &conn,
+ pool,
data.inserted_comment_1.id,
Some(data.inserted_person.id),
)
+ .await
.unwrap();
// Make sure block set the creator blocked
assert!(read_comment_from_blocked_person.creator_blocked);
- cleanup(data, &conn);
+ cleanup(data, pool).await;
}
- #[test]
+ #[tokio::test]
#[serial]
- fn test_comment_tree() {
- let conn = establish_unpooled_connection();
- let data = init_data(&conn);
+ async fn test_comment_tree() {
+ let pool = &build_db_pool_for_tests().await;
+ let data = init_data(pool).await;
let top_path = data.inserted_comment_0.path.clone();
let read_comment_views_top_path = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.post_id(Some(data.inserted_post.id))
.parent_path(Some(top_path))
.build()
.list()
+ .await
.unwrap();
let child_path = data.inserted_comment_1.path.clone();
let read_comment_views_child_path = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.post_id(Some(data.inserted_post.id))
.parent_path(Some(child_path))
.build()
.list()
+ .await
.unwrap();
// Make sure the comment parent-limited fetch is correct
assert!(!child_comments.contains(&data.inserted_comment_2));
let read_comment_views_top_max_depth = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.post_id(Some(data.inserted_post.id))
.max_depth(Some(1))
.build()
.list()
+ .await
.unwrap();
// Make sure a depth limited one only has the top comment
assert_eq!(
- expected_comment_view(&data, &conn),
+ expected_comment_view(&data, pool).await,
read_comment_views_top_max_depth[0]
);
assert_eq!(1, read_comment_views_top_max_depth.len());
let child_path = data.inserted_comment_1.path.clone();
let read_comment_views_parent_max_depth = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.post_id(Some(data.inserted_post.id))
.parent_path(Some(child_path))
.max_depth(Some(1))
.sort(Some(CommentSortType::New))
.build()
.list()
+ .await
.unwrap();
// Make sure a depth limited one, and given child comment 1, has 3
.eq("Comment 3"));
assert_eq!(3, read_comment_views_parent_max_depth.len());
- cleanup(data, &conn);
+ cleanup(data, pool).await;
}
- #[test]
+ #[tokio::test]
#[serial]
- fn test_languages() {
- let conn = establish_unpooled_connection();
- let data = init_data(&conn);
+ async fn test_languages() {
+ let pool = &build_db_pool_for_tests().await;
+ let data = init_data(pool).await;
// by default, user has all languages enabled and should see all comments
// (except from blocked user)
let all_languages = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.local_user(Some(&data.inserted_local_user))
.build()
.list()
+ .await
.unwrap();
assert_eq!(5, all_languages.len());
// change user lang to finnish, should only show single finnish comment
- let finnish_id = Language::read_id_from_code(&conn, "fi").unwrap();
- LocalUserLanguage::update_user_languages(
- &conn,
- Some(vec![finnish_id]),
- data.inserted_local_user.id,
- )
- .unwrap();
+ let finnish_id = Language::read_id_from_code(pool, Some("fi"))
+ .await
+ .unwrap()
+ .unwrap();
+ LocalUserLanguage::update(pool, vec![finnish_id], data.inserted_local_user.id)
+ .await
+ .unwrap();
let finnish_comment = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.local_user(Some(&data.inserted_local_user))
.build()
.list()
+ .await
.unwrap();
assert_eq!(1, finnish_comment.len());
assert_eq!(
assert_eq!(finnish_id, finnish_comment[0].comment.language_id);
// now show all comments with undetermined language (which is the default value)
- let undetermined_id = Language::read_id_from_code(&conn, "und").unwrap();
- LocalUserLanguage::update_user_languages(
- &conn,
- Some(vec![undetermined_id]),
- data.inserted_local_user.id,
- )
- .unwrap();
+ let undetermined_id = Language::read_id_from_code(pool, Some("und"))
+ .await
+ .unwrap()
+ .unwrap();
+ LocalUserLanguage::update(pool, vec![undetermined_id], data.inserted_local_user.id)
+ .await
+ .unwrap();
let undetermined_comment = CommentQuery::builder()
- .conn(&conn)
+ .pool(pool)
.local_user(Some(&data.inserted_local_user))
.build()
.list()
+ .await
.unwrap();
assert_eq!(3, undetermined_comment.len());
- cleanup(data, &conn);
+ cleanup(data, pool).await;
}
- fn cleanup(data: Data, conn: &PgConnection) {
- CommentLike::remove(conn, data.inserted_person.id, data.inserted_comment_0.id).unwrap();
- Comment::delete(conn, data.inserted_comment_0.id).unwrap();
- Comment::delete(conn, data.inserted_comment_1.id).unwrap();
- Post::delete(conn, data.inserted_post.id).unwrap();
- Community::delete(conn, data.inserted_community.id).unwrap();
- Person::delete(conn, data.inserted_person.id).unwrap();
- Person::delete(conn, data.inserted_person_2.id).unwrap();
+ async fn cleanup(data: Data, pool: &DbPool) {
+ CommentLike::remove(pool, data.inserted_person.id, data.inserted_comment_0.id)
+ .await
+ .unwrap();
+ Comment::delete(pool, data.inserted_comment_0.id)
+ .await
+ .unwrap();
+ Comment::delete(pool, data.inserted_comment_1.id)
+ .await
+ .unwrap();
+ Post::delete(pool, data.inserted_post.id).await.unwrap();
+ Community::delete(pool, data.inserted_community.id)
+ .await
+ .unwrap();
+ Person::delete(pool, data.inserted_person.id).await.unwrap();
+ Person::delete(pool, data.inserted_person_2.id)
+ .await
+ .unwrap();
+ Instance::delete(pool, data.inserted_instance.id)
+ .await
+ .unwrap();
}
- fn expected_comment_view(data: &Data, conn: &PgConnection) -> CommentView {
- let agg = CommentAggregates::read(conn, data.inserted_comment_0.id).unwrap();
+ async fn expected_comment_view(data: &Data, pool: &DbPool) -> CommentView {
+ let agg = CommentAggregates::read(pool, data.inserted_comment_0.id)
+ .await
+ .unwrap();
CommentView {
creator_banned_from_community: false,
my_vote: None,
updated: None,
local: true,
distinguished: false,
- path: data.inserted_comment_0.to_owned().path,
+ path: data.inserted_comment_0.clone().path,
language_id: LanguageId(0),
},
creator: PersonSafe {
display_name: None,
published: data.inserted_person.published,
avatar: None,
- actor_id: data.inserted_person.actor_id.to_owned(),
+ actor_id: data.inserted_person.actor_id.clone(),
local: true,
banned: false,
deleted: false,
bio: None,
banner: None,
updated: None,
- inbox_url: data.inserted_person.inbox_url.to_owned(),
+ inbox_url: data.inserted_person.inbox_url.clone(),
shared_inbox_url: None,
matrix_user_id: None,
ban_expires: None,
+ instance_id: data.inserted_instance.id,
},
post: Post {
id: data.inserted_post.id,
- name: data.inserted_post.name.to_owned(),
+ name: data.inserted_post.name.clone(),
creator_id: data.inserted_person.id,
url: None,
body: None,
removed: false,
deleted: false,
locked: false,
- stickied: false,
nsfw: false,
embed_title: None,
embed_description: None,
embed_video_url: None,
thumbnail_url: None,
- ap_id: data.inserted_post.ap_id.to_owned(),
+ ap_id: data.inserted_post.ap_id.clone(),
local: true,
language_id: Default::default(),
+ featured_community: false,
+ featured_local: false,
},
community: CommunitySafe {
id: data.inserted_community.id,
removed: false,
deleted: false,
nsfw: false,
- actor_id: data.inserted_community.actor_id.to_owned(),
+ actor_id: data.inserted_community.actor_id.clone(),
local: true,
title: "nada".to_owned(),
description: None,
hidden: false,
posting_restricted_to_mods: false,
published: data.inserted_community.published,
+ instance_id: data.inserted_instance.id,
},
counts: CommentAggregates {
id: agg.id,
projects / lemmy.git / blobdiff