use crate::structs::CommentView;
use diesel::{
- dsl::*,
result::Error,
BoolExpressionMethods,
ExpressionMethods,
use diesel_ltree::{nlevel, subpath, Ltree, LtreeExtensions};
use lemmy_db_schema::{
aggregates::structs::CommentAggregates,
- newtypes::{CommentId, CommunityId, DbUrl, LocalUserId, PersonId, PostId},
+ newtypes::{CommentId, CommunityId, LocalUserId, PersonId, PostId},
schema::{
comment,
comment_aggregates,
},
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, get_conn, limit_and_offset_unlimited, DbPool},
+ traits::JoinView,
+ utils::{fuzzy_search, get_conn, limit_and_offset_unlimited, DbPool},
CommentSortType,
ListingType,
};
type CommentViewTuple = (
Comment,
- PersonSafe,
+ Person,
Post,
- CommunitySafe,
+ Community,
CommentAggregates,
Option<CommunityPersonBan>,
Option<CommunityFollower>,
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(
)
.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(),
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>,
impl<'a> CommentQuery<'a> {
pub async fn list(self) -> Result<Vec<CommentView>, Error> {
- use diesel::dsl::*;
let conn = &mut get_conn(self.pool).await?;
// The left join below will return None in this case
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(
)
.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(),
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 => {
)
}
}
- };
-
- 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::id.is_not_null());
+ query = query.filter(comment_saved::comment_id.is_not_null());
}
if !self.show_deleted_and_removed.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());
+ if self.post_id.is_none() {
+ query = query.filter(community_block::person_id.is_null());
+ }
query = query.filter(person_block::person_id.is_null());
}
};
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()),
.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::*;
+ 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::{
actor_language::LocalUserLanguage,
- comment::*,
- community::*,
+ comment::{CommentInsertForm, CommentLike, CommentLikeForm},
+ community::CommunityInsertForm,
instance::Instance,
language::Language,
local_user::LocalUserInsertForm,
- person::*,
+ person::PersonInsertForm,
person_block::PersonBlockForm,
- post::*,
+ post::PostInsertForm,
},
traits::{Blockable, Crud, Likeable},
utils::build_db_pool_for_tests,
}
async fn init_data(pool: &DbPool) -> Data {
- let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap();
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .unwrap();
let new_person = PersonInsertForm::builder()
.name("timmy".into())
let inserted_person = Person::create(pool, &new_person).await.unwrap();
let local_user_form = LocalUserInsertForm::builder()
.person_id(inserted_person.id)
- .password_encrypted("".to_string())
+ .password_encrypted(String::new())
.build();
let inserted_local_user = LocalUser::create(pool, &local_user_form).await.unwrap();
.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
.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();
.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 finnish_id = Language::read_id_from_code(pool, "fi").await.unwrap();
+ 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(Some(finnish_id))
+ .language_id(finnish_id)
.build();
let inserted_comment_2 = Comment::create(pool, &comment_form_2, Some(&inserted_comment_0.path))
.content("Comment 3".into())
.creator_id(inserted_person.id)
.post_id(inserted_post.id)
+ .language_id(english_id)
.build();
let _inserted_comment_3 =
.await
.unwrap();
- let polish_id = Language::read_id_from_code(pool, "pl").await.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)
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()
.pool(pool)
+ .sort(Some(CommentSortType::Hot))
.post_id(Some(data.inserted_post.id))
.build()
.list()
let read_comment_views_with_person = CommentQuery::builder()
.pool(pool)
+ .sort(Some(CommentSortType::Hot))
.post_id(Some(data.inserted_post.id))
.local_user(Some(&data.inserted_local_user))
.build()
.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(pool, "fi").await.unwrap();
+ // 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_comment = CommentQuery::builder()
+ let finnish_comments = CommentQuery::builder()
.pool(pool)
.local_user(Some(&data.inserted_local_user))
.build()
.list()
.await
.unwrap();
- assert_eq!(1, finnish_comment.len());
+ 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[0].comment.content
+ finnish_comment.unwrap().comment.content
);
- 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(pool, "und").await.unwrap();
- LocalUserLanguage::update(pool, vec![undetermined_id], data.inserted_local_user.id)
+ LocalUserLanguage::update(pool, vec![UNDETERMINED_ID], data.inserted_local_user.id)
.await
.unwrap();
let undetermined_comment = CommentQuery::builder()
.list()
.await
.unwrap();
- assert_eq!(3, undetermined_comment.len());
+ assert_eq!(1, undetermined_comment.len());
cleanup(data, pool).await;
}
updated: None,
local: true,
distinguished: false,
- path: data.inserted_comment_0.to_owned().path,
- language_id: LanguageId(0),
+ path: data.inserted_comment_0.clone().path,
+ language_id: LanguageId(37),
},
- creator: PersonSafe {
+ creator: Person {
id: data.inserted_person.id,
name: "timmy".into(),
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,
+ 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: 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 {
+ community: Community {
id: data.inserted_community.id,
name: "test community 5".to_string(),
icon: None,
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,
posting_restricted_to_mods: false,
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,
downvotes: 0,
published: agg.published,
child_count: 5,
+ hot_rank: 1728,
},
}
}
projects / lemmy.git / blobdiff