X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fcomment_view.rs;h=9a9685c79e4bb11747f199cd7e5c2008bac3be1d;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=a7c96b17c5b1349f2ebd48669afe74950db455a7;hpb=a6dc6804aabbbd8966f802bb1a78a4dc20246955;p=lemmy.git

diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs
index a7c96b17..9a9685c7 100644
--- a/crates/db_views/src/comment_view.rs
+++ b/crates/db_views/src/comment_view.rs
@@ -1,9 +1,18 @@
 use crate::structs::CommentView;
-use diesel::{dsl::*, result::Error, *};
+use diesel::{
+  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,
-  newtypes::{CommentId, CommunityId, DbUrl, PersonId, PostId},
+  newtypes::{CommentId, CommunityId, LocalUserId, PersonId, PostId},
   schema::{
     comment,
     comment_aggregates,
@@ -13,30 +22,30 @@ use lemmy_db_schema::{
     community_block,
     community_follower,
     community_person_ban,
+    local_user_language,
     person,
     person_block,
     post,
   },
   source::{
     comment::{Comment, CommentSaved},
-    community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe},
+    community::{Community, CommunityFollower, CommunityPersonBan},
     local_user::LocalUser,
-    person::{Person, PersonSafe},
+    person::Person,
     person_block::PersonBlock,
     post::Post,
   },
-  traits::{ToSafe, ViewToVec},
-  utils::{functions::hot_rank, fuzzy_search, limit_and_offset_unlimited},
+  traits::JoinView,
+  utils::{fuzzy_search, get_conn, limit_and_offset, DbPool},
   CommentSortType,
   ListingType,
 };
-use typed_builder::TypedBuilder;
 
 type CommentViewTuple = (
   Comment,
-  PersonSafe,
+  Person,
   Post,
-  CommunitySafe,
+  Community,
   CommentAggregates,
   Option<CommunityPersonBan>,
   Option<CommunityFollower>,
@@ -46,11 +55,13 @@ type CommentViewTuple = (
 );
 
 impl CommentView {
-  pub fn read(
-    conn: &PgConnection,
+  pub async fn read(
+    pool: &mut 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));
 
@@ -75,12 +86,7 @@ impl CommentView {
         community_person_ban::table.on(
           community::id
             .eq(community_person_ban::community_id)
-            .and(community_person_ban::person_id.eq(comment::creator_id))
-            .and(
-              community_person_ban::expires
-                .is_null()
-                .or(community_person_ban::expires.gt(now)),
-            ),
+            .and(community_person_ban::person_id.eq(comment::creator_id)),
         ),
       )
       .left_join(
@@ -113,9 +119,9 @@ impl CommentView {
       )
       .select((
         comment::all_columns,
-        Person::safe_columns_tuple(),
+        person::all_columns,
         post::all_columns,
-        Community::safe_columns_tuple(),
+        community::all_columns,
         comment_aggregates::all_columns,
         community_person_ban::all_columns.nullable(),
         community_follower::all_columns.nullable(),
@@ -123,7 +129,8 @@ impl CommentView {
         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
@@ -148,32 +155,30 @@ impl CommentView {
   }
 }
 
-#[derive(TypedBuilder)]
-#[builder(field_defaults(default))]
+#[derive(Default)]
 pub struct CommentQuery<'a> {
-  #[builder(!default)]
-  conn: &'a PgConnection,
-  listing_type: Option<ListingType>,
-  sort: Option<CommentSortType>,
-  community_id: Option<CommunityId>,
-  community_actor_id: Option<DbUrl>,
-  post_id: Option<PostId>,
-  parent_path: Option<Ltree>,
-  creator_id: Option<PersonId>,
-  local_user: Option<&'a LocalUser>,
-  search_term: Option<String>,
-  saved_only: Option<bool>,
-  page: Option<i64>,
-  limit: Option<i64>,
-  max_depth: Option<i32>,
+  pub listing_type: Option<ListingType>,
+  pub sort: Option<CommentSortType>,
+  pub community_id: Option<CommunityId>,
+  pub post_id: Option<PostId>,
+  pub parent_path: Option<Ltree>,
+  pub creator_id: Option<PersonId>,
+  pub local_user: Option<&'a LocalUser>,
+  pub search_term: Option<String>,
+  pub saved_only: Option<bool>,
+  pub show_deleted_and_removed: Option<bool>,
+  pub page: Option<i64>,
+  pub limit: Option<i64>,
+  pub max_depth: Option<i32>,
 }
 
 impl<'a> CommentQuery<'a> {
-  pub fn list(self) -> Result<Vec<CommentView>, Error> {
-    use diesel::dsl::*;
+  pub async fn list(self, pool: &mut DbPool<'_>) -> Result<Vec<CommentView>, Error> {
+    let conn = &mut get_conn(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));
+    let local_user_id_join = self.local_user.map(|l| l.id).unwrap_or(LocalUserId(-1));
 
     let mut query = comment::table
       .inner_join(person::table)
@@ -184,12 +189,7 @@ impl<'a> CommentQuery<'a> {
         community_person_ban::table.on(
           community::id
             .eq(community_person_ban::community_id)
-            .and(community_person_ban::person_id.eq(comment::creator_id))
-            .and(
-              community_person_ban::expires
-                .is_null()
-                .or(community_person_ban::expires.gt(now)),
-            ),
+            .and(community_person_ban::person_id.eq(comment::creator_id)),
         ),
       )
       .left_join(
@@ -227,11 +227,18 @@ impl<'a> CommentQuery<'a> {
             .and(comment_like::person_id.eq(person_id_join)),
         ),
       )
+      .left_join(
+        local_user_language::table.on(
+          comment::language_id
+            .eq(local_user_language::language_id)
+            .and(local_user_language::local_user_id.eq(local_user_id_join)),
+        ),
+      )
       .select((
         comment::all_columns,
-        Person::safe_columns_tuple(),
+        person::all_columns,
         post::all_columns,
-        Community::safe_columns_tuple(),
+        community::all_columns,
         comment_aggregates::all_columns,
         community_person_ban::all_columns.nullable(),
         community_follower::all_columns.nullable(),
@@ -257,6 +264,10 @@ impl<'a> CommentQuery<'a> {
       query = query.filter(comment::content.ilike(fuzzy_search(&search_term)));
     };
 
+    if let Some(community_id) = self.community_id {
+      query = query.filter(post::community_id.eq(community_id));
+    }
+
     if let Some(listing_type) = self.listing_type {
       match listing_type {
         ListingType::Subscribed => {
@@ -277,27 +288,29 @@ impl<'a> CommentQuery<'a> {
           )
         }
       }
-    };
-
-    if let Some(community_id) = self.community_id {
-      query = query.filter(post::community_id.eq(community_id));
     }
 
-    if let Some(community_actor_id) = self.community_actor_id {
-      query = query.filter(community::actor_id.eq(community_actor_id))
+    if self.saved_only.unwrap_or(false) {
+      query = query.filter(comment_saved::comment_id.is_not_null());
     }
 
-    if self.saved_only.unwrap_or(false) {
-      query = query.filter(comment_saved::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) {
       query = query.filter(person::bot_account.eq(false));
     };
 
-    // Don't show blocked communities or persons
     if self.local_user.is_some() {
-      query = query.filter(community_block::person_id.is_null());
+      // Filter out the rows with missing languages
+      query = query.filter(local_user_language::language_id.is_not_null());
+
+      // Don't show blocked communities or persons
+      if self.post_id.is_none() {
+        query = query.filter(community_block::person_id.is_null());
+      }
       query = query.filter(person_block::person_id.is_null());
     }
 
@@ -323,15 +336,16 @@ impl<'a> CommentQuery<'a> {
       // This does not work for comment trees, and the limit should be manually set to a high number
       //
       // If a max depth is given, then you know its a tree fetch, and limits should be ignored
-      (i64::MAX, 0)
+      // TODO a kludge to prevent attacks. Limit comments to 300 for now.
+      // (i64::MAX, 0)
+      (300, 0)
     } else {
-      limit_and_offset_unlimited(self.page, self.limit)
+      // limit_and_offset_unlimited(self.page, self.limit)
+      limit_and_offset(self.page, self.limit)?
     };
 
     query = match self.sort.unwrap_or(CommentSortType::Hot) {
-      CommentSortType::Hot => query
-        .then_order_by(hot_rank(comment_aggregates::score, comment_aggregates::published).desc())
-        .then_order_by(comment_aggregates::published.desc()),
+      CommentSortType::Hot => query.then_order_by(comment_aggregates::hot_rank.desc()),
       CommentSortType::New => query.then_order_by(comment::published.desc()),
       CommentSortType::Old => query.then_order_by(comment::published.asc()),
       CommentSortType::Top => query.order_by(comment_aggregates::score.desc()),
@@ -341,94 +355,122 @@ impl<'a> CommentQuery<'a> {
     let res = query
       .limit(limit)
       .offset(offset)
-      .load::<CommentViewTuple>(self.conn)?;
+      .load::<CommentViewTuple>(conn)
+      .await?;
 
-    Ok(CommentView::from_tuple_to_vec(res))
+    Ok(res.into_iter().map(CommentView::from_tuple).collect())
   }
 }
 
-impl ViewToVec for CommentView {
-  type DbTuple = CommentViewTuple;
-  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
-    items
-      .into_iter()
-      .map(|a| Self {
-        comment: a.0,
-        creator: a.1,
-        post: a.2,
-        community: a.3,
-        counts: a.4,
-        creator_banned_from_community: a.5.is_some(),
-        subscribed: CommunityFollower::to_subscribed_type(&a.6),
-        saved: a.7.is_some(),
-        creator_blocked: a.8.is_some(),
-        my_vote: a.9,
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for CommentView {
+  type JoinTuple = CommentViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      comment: a.0,
+      creator: a.1,
+      post: a.2,
+      community: a.3,
+      counts: a.4,
+      creator_banned_from_community: a.5.is_some(),
+      subscribed: CommunityFollower::to_subscribed_type(&a.6),
+      saved: a.7.is_some(),
+      creator_blocked: a.8.is_some(),
+      my_vote: a.9,
+    }
   }
 }
 
 #[cfg(test)]
 mod tests {
-  use crate::comment_view::*;
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
+  use crate::comment_view::{
+    Comment,
+    CommentQuery,
+    CommentSortType,
+    CommentView,
+    Community,
+    DbPool,
+    LocalUser,
+    Person,
+    PersonBlock,
+    Post,
+  };
   use lemmy_db_schema::{
     aggregates::structs::CommentAggregates,
+    impls::actor_language::UNDETERMINED_ID,
+    newtypes::LanguageId,
     source::{
-      comment::*,
-      community::*,
-      local_user::LocalUserForm,
-      person::*,
+      actor_language::LocalUserLanguage,
+      comment::{CommentInsertForm, CommentLike, CommentLikeForm},
+      community::CommunityInsertForm,
+      instance::Instance,
+      language::Language,
+      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;
 
-  #[test]
-  #[serial]
-  fn test_crud() {
-    let conn = establish_unpooled_connection();
-
-    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();
+  struct Data {
+    inserted_instance: Instance,
+    inserted_comment_0: Comment,
+    inserted_comment_1: Comment,
+    inserted_comment_2: Comment,
+    inserted_post: Post,
+    inserted_person: Person,
+    inserted_local_user: LocalUser,
+    inserted_person_2: Person,
+    inserted_community: Community,
+  }
 
-    let new_post = PostForm {
-      name: "A test post 2".into(),
-      creator_id: inserted_person.id,
-      community_id: inserted_community.id,
-      ..PostForm::default()
-    };
+  async fn init_data(pool: &mut DbPool<'_>) -> Data {
+    let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+      .await
+      .unwrap();
 
-    let inserted_post = Post::create(&conn, &new_post).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();
+    let english_id = Language::read_id_from_code(pool, Some("en")).await.unwrap();
 
     // Create a comment tree with this hierarchy
     //       0
@@ -438,71 +480,84 @@ mod tests {
     //  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 comment_form_0 = CommentInsertForm::builder()
+      .content("Comment 0".into())
+      .creator_id(inserted_person.id)
+      .post_id(inserted_post.id)
+      .language_id(english_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)
+      .language_id(english_id)
+      .build();
+
+    let inserted_comment_1 = Comment::create(pool, &comment_form_1, Some(&inserted_comment_0.path))
+      .await
+      .unwrap();
 
-    let comment_form_2 = CommentForm {
-      content: "Comment 2".into(),
-      creator_id: inserted_person.id,
-      post_id: inserted_post.id,
-      ..CommentForm::default()
-    };
+    let finnish_id = Language::read_id_from_code(pool, Some("fi")).await.unwrap();
+    let comment_form_2 = CommentInsertForm::builder()
+      .content("Comment 2".into())
+      .creator_id(inserted_person.id)
+      .post_id(inserted_post.id)
+      .language_id(finnish_id)
+      .build();
 
-    let inserted_comment_2 =
-      Comment::create(&conn, &comment_form_2, Some(&inserted_comment_0.path)).unwrap();
+    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)
+      .language_id(english_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 comment_form_4 = CommentForm {
-      content: "Comment 4".into(),
-      creator_id: inserted_person.id,
-      post_id: inserted_post.id,
-      ..CommentForm::default()
-    };
+    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 inserted_comment_4 =
-      Comment::create(&conn, &comment_form_4, Some(&inserted_comment_1.path)).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,
@@ -510,7 +565,6 @@ mod tests {
       target_id: inserted_person_2.id,
       published: inserted_block.published,
     };
-
     assert_eq!(expected_block, inserted_block);
 
     let comment_like_form = CommentLikeForm {
@@ -520,38 +574,270 @@ mod tests {
       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,
+      inserted_post,
+      inserted_person,
+      inserted_local_user,
+      inserted_person_2,
+      inserted_community,
+    }
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn test_crud() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
+    let data = init_data(pool).await;
+
+    let expected_comment_view_no_person = expected_comment_view(&data, pool).await;
+
+    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 {
+      sort: (Some(CommentSortType::Old)),
+      post_id: (Some(data.inserted_post.id)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+
+    assert_eq!(
+      expected_comment_view_no_person,
+      read_comment_views_no_person[0]
+    );
 
-    let agg = CommentAggregates::read(&conn, inserted_comment_0.id).unwrap();
+    let read_comment_views_with_person = CommentQuery {
+      sort: (Some(CommentSortType::Old)),
+      post_id: (Some(data.inserted_post.id)),
+      local_user: (Some(&data.inserted_local_user)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
 
-    let top_path = inserted_comment_0.to_owned().path;
-    let expected_comment_view_no_person = CommentView {
+    assert_eq!(
+      expected_comment_view_with_person,
+      read_comment_views_with_person[0]
+    );
+
+    // Make sure its 1, not showing the blocked comment
+    assert_eq!(5, read_comment_views_with_person.len());
+
+    let read_comment_from_blocked_person = CommentView::read(
+      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, pool).await;
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn test_comment_tree() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
+    let data = init_data(pool).await;
+
+    let top_path = data.inserted_comment_0.path.clone();
+    let read_comment_views_top_path = CommentQuery {
+      post_id: (Some(data.inserted_post.id)),
+      parent_path: (Some(top_path)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+
+    let child_path = data.inserted_comment_1.path.clone();
+    let read_comment_views_child_path = CommentQuery {
+      post_id: (Some(data.inserted_post.id)),
+      parent_path: (Some(child_path)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+
+    // Make sure the comment parent-limited fetch is correct
+    assert_eq!(6, read_comment_views_top_path.len());
+    assert_eq!(4, read_comment_views_child_path.len());
+
+    // Make sure it contains the parent, but not the comment from the other tree
+    let child_comments = read_comment_views_child_path
+      .into_iter()
+      .map(|c| c.comment)
+      .collect::<Vec<Comment>>();
+    assert!(child_comments.contains(&data.inserted_comment_1));
+    assert!(!child_comments.contains(&data.inserted_comment_2));
+
+    let read_comment_views_top_max_depth = CommentQuery {
+      post_id: (Some(data.inserted_post.id)),
+      max_depth: (Some(1)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+
+    // Make sure a depth limited one only has the top comment
+    assert_eq!(
+      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 {
+      post_id: (Some(data.inserted_post.id)),
+      parent_path: (Some(child_path)),
+      max_depth: (Some(1)),
+      sort: (Some(CommentSortType::New)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+
+    // Make sure a depth limited one, and given child comment 1, has 3
+    assert!(read_comment_views_parent_max_depth[2]
+      .comment
+      .content
+      .eq("Comment 3"));
+    assert_eq!(3, read_comment_views_parent_max_depth.len());
+
+    cleanup(data, pool).await;
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn test_languages() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
+    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 {
+      local_user: (Some(&data.inserted_local_user)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+    assert_eq!(5, all_languages.len());
+
+    // change user lang to finnish, should only show one post in finnish and one undetermined
+    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_comments = CommentQuery {
+      local_user: (Some(&data.inserted_local_user)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+    assert_eq!(2, finnish_comments.len());
+    let finnish_comment = finnish_comments
+      .iter()
+      .find(|c| c.comment.language_id == finnish_id);
+    assert!(finnish_comment.is_some());
+    assert_eq!(
+      data.inserted_comment_2.content,
+      finnish_comment.unwrap().comment.content
+    );
+
+    // now show all comments with undetermined language (which is the default value)
+    LocalUserLanguage::update(pool, vec![UNDETERMINED_ID], data.inserted_local_user.id)
+      .await
+      .unwrap();
+    let undetermined_comment = CommentQuery {
+      local_user: (Some(&data.inserted_local_user)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
+    assert_eq!(1, undetermined_comment.len());
+
+    cleanup(data, pool).await;
+  }
+
+  async fn cleanup(data: Data, pool: &mut 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();
+  }
+
+  async fn expected_comment_view(data: &Data, pool: &mut DbPool<'_>) -> CommentView {
+    let agg = CommentAggregates::read(pool, data.inserted_comment_0.id)
+      .await
+      .unwrap();
+    CommentView {
       creator_banned_from_community: false,
       my_vote: None,
       subscribed: SubscribedType::NotSubscribed,
       saved: false,
       creator_blocked: false,
       comment: Comment {
-        id: inserted_comment_0.id,
+        id: data.inserted_comment_0.id,
         content: "Comment 0".into(),
-        creator_id: inserted_person.id,
-        post_id: inserted_post.id,
+        creator_id: data.inserted_person.id,
+        post_id: data.inserted_post.id,
         removed: false,
         deleted: false,
-        published: inserted_comment_0.published,
-        ap_id: inserted_comment_0.ap_id,
+        published: data.inserted_comment_0.published,
+        ap_id: data.inserted_comment_0.ap_id.clone(),
         updated: None,
         local: true,
         distinguished: false,
-        path: top_path,
+        path: data.inserted_comment_0.clone().path,
+        language_id: LanguageId(37),
       },
-      creator: PersonSafe {
-        id: inserted_person.id,
+      creator: Person {
+        id: data.inserted_person.id,
         name: "timmy".into(),
         display_name: None,
-        published: inserted_person.published,
+        published: data.inserted_person.published,
         avatar: None,
-        actor_id: inserted_person.actor_id.to_owned(),
+        actor_id: data.inserted_person.actor_id.clone(),
         local: true,
         banned: false,
         deleted: false,
@@ -560,41 +846,46 @@ mod tests {
         bio: None,
         banner: None,
         updated: None,
-        inbox_url: 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,
+        private_key: data.inserted_person.private_key.clone(),
+        public_key: data.inserted_person.public_key.clone(),
+        last_refreshed_at: data.inserted_person.last_refreshed_at,
       },
       post: Post {
-        id: inserted_post.id,
-        name: inserted_post.name.to_owned(),
-        creator_id: inserted_person.id,
+        id: data.inserted_post.id,
+        name: data.inserted_post.name.clone(),
+        creator_id: data.inserted_person.id,
         url: None,
         body: None,
-        published: inserted_post.published,
+        published: data.inserted_post.published,
         updated: None,
-        community_id: inserted_community.id,
+        community_id: data.inserted_community.id,
         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: 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: inserted_community.id,
+      community: Community {
+        id: data.inserted_community.id,
         name: "test community 5".to_string(),
         icon: None,
         removed: false,
         deleted: false,
         nsfw: false,
-        actor_id: inserted_community.actor_id.to_owned(),
+        actor_id: data.inserted_community.actor_id.clone(),
         local: true,
         title: "nada".to_owned(),
         description: None,
@@ -602,130 +893,27 @@ mod tests {
         banner: None,
         hidden: false,
         posting_restricted_to_mods: false,
-        published: inserted_community.published,
+        published: data.inserted_community.published,
+        instance_id: data.inserted_instance.id,
+        private_key: data.inserted_community.private_key.clone(),
+        public_key: data.inserted_community.public_key.clone(),
+        last_refreshed_at: data.inserted_community.last_refreshed_at,
+        followers_url: data.inserted_community.followers_url.clone(),
+        inbox_url: data.inserted_community.inbox_url.clone(),
+        shared_inbox_url: data.inserted_community.shared_inbox_url.clone(),
+        moderators_url: data.inserted_community.moderators_url.clone(),
+        featured_url: data.inserted_community.featured_url.clone(),
       },
       counts: CommentAggregates {
         id: agg.id,
-        comment_id: inserted_comment_0.id,
+        comment_id: data.inserted_comment_0.id,
         score: 1,
         upvotes: 1,
         downvotes: 0,
         published: agg.published,
         child_count: 5,
+        hot_rank: 1728,
       },
-    };
-
-    let mut expected_comment_view_with_person = expected_comment_view_no_person.to_owned();
-    expected_comment_view_with_person.my_vote = Some(1);
-
-    let read_comment_views_no_person = CommentQuery::builder()
-      .conn(&conn)
-      .post_id(Some(inserted_post.id))
-      .build()
-      .list()
-      .unwrap();
-
-    assert_eq!(
-      expected_comment_view_no_person,
-      read_comment_views_no_person[0]
-    );
-
-    let read_comment_views_with_person = CommentQuery::builder()
-      .conn(&conn)
-      .post_id(Some(inserted_post.id))
-      .local_user(Some(&inserted_local_user))
-      .build()
-      .list()
-      .unwrap();
-
-    assert_eq!(
-      expected_comment_view_with_person,
-      read_comment_views_with_person[0]
-    );
-
-    // Make sure its 1, not showing the blocked comment
-    assert_eq!(5, read_comment_views_with_person.len());
-
-    let read_comment_from_blocked_person =
-      CommentView::read(&conn, inserted_comment_1.id, Some(inserted_person.id)).unwrap();
-
-    // Make sure block set the creator blocked
-    assert!(read_comment_from_blocked_person.creator_blocked);
-
-    let top_path = inserted_comment_0.path;
-    let read_comment_views_top_path = CommentQuery::builder()
-      .conn(&conn)
-      .post_id(Some(inserted_post.id))
-      .parent_path(Some(top_path))
-      .build()
-      .list()
-      .unwrap();
-
-    let child_path = inserted_comment_1.to_owned().path;
-    let read_comment_views_child_path = CommentQuery::builder()
-      .conn(&conn)
-      .post_id(Some(inserted_post.id))
-      .parent_path(Some(child_path))
-      .build()
-      .list()
-      .unwrap();
-
-    // Make sure the comment parent-limited fetch is correct
-    assert_eq!(6, read_comment_views_top_path.len());
-    assert_eq!(4, read_comment_views_child_path.len());
-
-    // Make sure it contains the parent, but not the comment from the other tree
-    let child_comments = read_comment_views_child_path
-      .into_iter()
-      .map(|c| c.comment)
-      .collect::<Vec<Comment>>();
-    assert!(child_comments.contains(&inserted_comment_1));
-    assert!(!child_comments.contains(&inserted_comment_2));
-
-    let read_comment_views_top_max_depth = CommentQuery::builder()
-      .conn(&conn)
-      .post_id(Some(inserted_post.id))
-      .max_depth(Some(1))
-      .build()
-      .list()
-      .unwrap();
-
-    // Make sure a depth limited one only has the top comment
-    assert_eq!(
-      expected_comment_view_no_person,
-      read_comment_views_top_max_depth[0]
-    );
-    assert_eq!(1, read_comment_views_top_max_depth.len());
-
-    let child_path = inserted_comment_1.path;
-    let read_comment_views_parent_max_depth = CommentQuery::builder()
-      .conn(&conn)
-      .post_id(Some(inserted_post.id))
-      .parent_path(Some(child_path))
-      .max_depth(Some(1))
-      .sort(Some(CommentSortType::New))
-      .build()
-      .list()
-      .unwrap();
-
-    // Make sure a depth limited one, and given child comment 1, has 3
-    assert!(read_comment_views_parent_max_depth[2]
-      .comment
-      .content
-      .eq("Comment 3"));
-    assert_eq!(3, read_comment_views_parent_max_depth.len());
-
-    // Delete everything
-    let like_removed =
-      CommentLike::remove(&conn, inserted_person.id, inserted_comment_0.id).unwrap();
-    let num_deleted = Comment::delete(&conn, inserted_comment_0.id).unwrap();
-    Comment::delete(&conn, inserted_comment_1.id).unwrap();
-    Post::delete(&conn, inserted_post.id).unwrap();
-    Community::delete(&conn, inserted_community.id).unwrap();
-    Person::delete(&conn, inserted_person.id).unwrap();
-    Person::delete(&conn, inserted_person_2.id).unwrap();
-
-    assert_eq!(1, num_deleted);
-    assert_eq!(1, like_removed);
+    }
   }
 }