-use diesel::{result::Error, *};
-use lemmy_db_queries::{
- aggregates::comment_aggregates::CommentAggregates,
- functions::hot_rank,
- fuzzy_search,
- limit_and_offset,
- ListingType,
- MaybeOptional,
- SortType,
- ToSafe,
- ViewToVec,
-};
+use crate::structs::CommentView;
+use diesel::{dsl::*, result::Error, *};
use lemmy_db_schema::{
+ aggregates::structs::CommentAggregates,
+ newtypes::{CommentId, CommunityId, DbUrl, PersonId, PostId},
schema::{
comment,
comment_aggregates,
comment_like,
comment_saved,
community,
+ community_block,
community_follower,
community_person_ban,
person,
person_alias_1,
+ person_block,
post,
},
source::{
comment::{Comment, CommentAlias1, CommentSaved},
community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe},
person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
+ person_block::PersonBlock,
post::Post,
},
- CommentId,
- CommunityId,
- PersonId,
- PostId,
+ traits::{MaybeOptional, ToSafe, ViewToVec},
+ utils::{functions::hot_rank, fuzzy_search, limit_and_offset},
+ ListingType,
+ SortType,
};
-use serde::Serialize;
-
-#[derive(Debug, PartialEq, Serialize, Clone)]
-pub struct CommentView {
- pub comment: Comment,
- pub creator: PersonSafe,
- pub recipient: Option<PersonSafeAlias1>, // Left joins to comment and person
- pub post: Post,
- pub community: CommunitySafe,
- pub counts: CommentAggregates,
- pub creator_banned_from_community: bool, // Left Join to CommunityPersonBan
- pub subscribed: bool, // Left join to CommunityFollower
- pub saved: bool, // Left join to CommentSaved
- pub my_vote: Option<i16>, // Left join to CommentLike
-}
type CommentViewTuple = (
Comment,
Option<CommunityPersonBan>,
Option<CommunityFollower>,
Option<CommentSaved>,
+ Option<PersonBlock>,
Option<i16>,
);
creator_banned_from_community,
subscribed,
saved,
+ creator_blocked,
comment_like,
) = comment::table
.find(comment_id)
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::person_id.eq(comment::creator_id))
+ .and(
+ community_person_ban::expires
+ .is_null()
+ .or(community_person_ban::expires.gt(now)),
+ ),
),
)
.left_join(
.and(comment_saved::person_id.eq(person_id_join)),
),
)
+ .left_join(
+ person_block::table.on(
+ comment::creator_id
+ .eq(person_block::target_id)
+ .and(person_block::person_id.eq(person_id_join)),
+ ),
+ )
.left_join(
comment_like::table.on(
comment::id
community_person_ban::all_columns.nullable(),
community_follower::all_columns.nullable(),
comment_saved::all_columns.nullable(),
+ person_block::all_columns.nullable(),
comment_like::score.nullable(),
))
.first::<CommentViewTuple>(conn)?;
creator_banned_from_community: creator_banned_from_community.is_some(),
subscribed: subscribed.is_some(),
saved: saved.is_some(),
+ creator_blocked: creator_blocked.is_some(),
my_vote,
})
}
None => self.post.creator_id,
}
}
+
+ /// Gets the number of unread replies
+ pub fn get_unread_replies(conn: &PgConnection, my_person_id: PersonId) -> Result<i64, Error> {
+ use diesel::dsl::*;
+
+ comment::table
+ // recipient here
+ .left_join(comment_alias_1::table.on(comment_alias_1::id.nullable().eq(comment::parent_id)))
+ .left_join(person_alias_1::table.on(person_alias_1::id.eq(comment_alias_1::creator_id)))
+ .inner_join(post::table)
+ .inner_join(community::table.on(post::community_id.eq(community::id)))
+ .left_join(
+ person_block::table.on(
+ comment::creator_id
+ .eq(person_block::target_id)
+ .and(person_block::person_id.eq(my_person_id)),
+ ),
+ )
+ .left_join(
+ community_block::table.on(
+ community::id
+ .eq(community_block::community_id)
+ .and(community_block::person_id.eq(my_person_id)),
+ ),
+ )
+ .filter(person_alias_1::id.eq(my_person_id)) // Gets the comment replies
+ .or_filter(
+ comment::parent_id
+ .is_null()
+ .and(post::creator_id.eq(my_person_id)),
+ ) // Gets the top level replies
+ .filter(comment::read.eq(false))
+ .filter(comment::deleted.eq(false))
+ .filter(comment::removed.eq(false))
+ // Don't show blocked communities or persons
+ .filter(community_block::person_id.is_null())
+ .filter(person_block::person_id.is_null())
+ .select(count(comment::id))
+ .first::<i64>(conn)
+ }
}
pub struct CommentQueryBuilder<'a> {
conn: &'a PgConnection,
- listing_type: &'a ListingType,
- sort: &'a SortType,
+ listing_type: Option<ListingType>,
+ sort: Option<SortType>,
community_id: Option<CommunityId>,
- community_name: Option<String>,
+ community_actor_id: Option<DbUrl>,
post_id: Option<PostId>,
creator_id: Option<PersonId>,
recipient_id: Option<PersonId>,
my_person_id: Option<PersonId>,
search_term: Option<String>,
- saved_only: bool,
- unread_only: bool,
- show_bot_accounts: bool,
+ saved_only: Option<bool>,
+ unread_only: Option<bool>,
+ show_bot_accounts: Option<bool>,
page: Option<i64>,
limit: Option<i64>,
}
pub fn create(conn: &'a PgConnection) -> Self {
CommentQueryBuilder {
conn,
- listing_type: &ListingType::All,
- sort: &SortType::New,
+ listing_type: None,
+ sort: None,
community_id: None,
- community_name: None,
+ community_actor_id: None,
post_id: None,
creator_id: None,
recipient_id: None,
my_person_id: None,
search_term: None,
- saved_only: false,
- unread_only: false,
- show_bot_accounts: true,
+ saved_only: None,
+ unread_only: None,
+ show_bot_accounts: None,
page: None,
limit: None,
}
}
- pub fn listing_type(mut self, listing_type: &'a ListingType) -> Self {
- self.listing_type = listing_type;
+ pub fn listing_type<T: MaybeOptional<ListingType>>(mut self, listing_type: T) -> Self {
+ self.listing_type = listing_type.get_optional();
self
}
- pub fn sort(mut self, sort: &'a SortType) -> Self {
- self.sort = sort;
+ pub fn sort<T: MaybeOptional<SortType>>(mut self, sort: T) -> Self {
+ self.sort = sort.get_optional();
self
}
self
}
- pub fn community_name<T: MaybeOptional<String>>(mut self, community_name: T) -> Self {
- self.community_name = community_name.get_optional();
+ pub fn community_actor_id<T: MaybeOptional<DbUrl>>(mut self, community_actor_id: T) -> Self {
+ self.community_actor_id = community_actor_id.get_optional();
self
}
self
}
- pub fn saved_only(mut self, saved_only: bool) -> Self {
- self.saved_only = saved_only;
+ pub fn saved_only<T: MaybeOptional<bool>>(mut self, saved_only: T) -> Self {
+ self.saved_only = saved_only.get_optional();
self
}
- pub fn unread_only(mut self, unread_only: bool) -> Self {
- self.unread_only = unread_only;
+ pub fn unread_only<T: MaybeOptional<bool>>(mut self, unread_only: T) -> Self {
+ self.unread_only = unread_only.get_optional();
self
}
- pub fn show_bot_accounts(mut self, show_bot_accounts: bool) -> Self {
- self.show_bot_accounts = show_bot_accounts;
+ pub fn show_bot_accounts<T: MaybeOptional<bool>>(mut self, show_bot_accounts: T) -> Self {
+ self.show_bot_accounts = show_bot_accounts.get_optional();
self
}
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::person_id.eq(comment::creator_id))
+ .and(
+ community_person_ban::expires
+ .is_null()
+ .or(community_person_ban::expires.gt(now)),
+ ),
),
)
.left_join(
.and(comment_saved::person_id.eq(person_id_join)),
),
)
+ .left_join(
+ person_block::table.on(
+ comment::creator_id
+ .eq(person_block::target_id)
+ .and(person_block::person_id.eq(person_id_join)),
+ ),
+ )
+ .left_join(
+ community_block::table.on(
+ community::id
+ .eq(community_block::community_id)
+ .and(community_block::person_id.eq(person_id_join)),
+ ),
+ )
.left_join(
comment_like::table.on(
comment::id
community_person_ban::all_columns.nullable(),
community_follower::all_columns.nullable(),
comment_saved::all_columns.nullable(),
+ person_block::all_columns.nullable(),
comment_like::score.nullable(),
))
.into_boxed();
.filter(comment::removed.eq(false));
}
- if self.unread_only {
+ if self.unread_only.unwrap_or(false) {
query = query.filter(comment::read.eq(false));
}
query = query.filter(post::community_id.eq(community_id));
}
- if let Some(community_name) = self.community_name {
- query = query
- .filter(community::name.eq(community_name))
- .filter(comment::local.eq(true));
+ if let Some(community_actor_id) = self.community_actor_id {
+ query = query.filter(community::actor_id.eq(community_actor_id))
}
if let Some(post_id) = self.post_id {
query = query.filter(comment::content.ilike(fuzzy_search(&search_term)));
};
- query = match self.listing_type {
- // ListingType::Subscribed => query.filter(community_follower::subscribed.eq(true)),
- ListingType::Subscribed => query.filter(community_follower::person_id.is_not_null()), // TODO could be this: and(community_follower::person_id.eq(person_id_join)),
- ListingType::Local => query.filter(community::local.eq(true)),
- _ => query,
- };
+ if let Some(listing_type) = self.listing_type {
+ match listing_type {
+ ListingType::Subscribed => {
+ query = query.filter(community_follower::person_id.is_not_null())
+ } // TODO could be this: and(community_follower::person_id.eq(person_id_join)),
+ ListingType::Local => {
+ query = query.filter(community::local.eq(true)).filter(
+ community::hidden
+ .eq(false)
+ .or(community_follower::person_id.eq(person_id_join)),
+ )
+ }
+ ListingType::All => {
+ query = query.filter(
+ community::hidden
+ .eq(false)
+ .or(community_follower::person_id.eq(person_id_join)),
+ )
+ }
+ ListingType::Community => {}
+ };
+ }
- if self.saved_only {
+ if self.saved_only.unwrap_or(false) {
query = query.filter(comment_saved::id.is_not_null());
}
- if !self.show_bot_accounts {
+ if !self.show_bot_accounts.unwrap_or(true) {
query = query.filter(person::bot_account.eq(false));
};
- query = match self.sort {
+ query = match self.sort.unwrap_or(SortType::New) {
SortType::Hot | SortType::Active => query
.order_by(hot_rank(comment_aggregates::score, comment_aggregates::published).desc())
.then_order_by(comment_aggregates::published.desc()),
.order_by(comment_aggregates::score.desc()),
};
+ // Don't show blocked communities or persons
+ if self.my_person_id.is_some() {
+ query = query.filter(community_block::person_id.is_null());
+ query = query.filter(person_block::person_id.is_null());
+ }
+
let (limit, offset) = limit_and_offset(self.page, self.limit);
// Note: deleted and removed comments are done on the front side
creator_banned_from_community: a.7.is_some(),
subscribed: a.8.is_some(),
saved: a.9.is_some(),
- my_vote: a.10,
+ creator_blocked: a.10.is_some(),
+ my_vote: a.11,
})
.collect::<Vec<Self>>()
}
#[cfg(test)]
mod tests {
use crate::comment_view::*;
- use lemmy_db_queries::{
- aggregates::comment_aggregates::CommentAggregates,
- establish_unpooled_connection,
- Crud,
- Likeable,
+ use lemmy_db_schema::{
+ aggregates::structs::CommentAggregates,
+ source::{comment::*, community::*, person::*, person_block::PersonBlockForm, post::*},
+ traits::{Blockable, Crud, Likeable},
+ utils::establish_unpooled_connection,
};
- use lemmy_db_schema::source::{comment::*, community::*, person::*, post::*};
use serial_test::serial;
#[test]
let inserted_person = Person::create(&conn, &new_person).unwrap();
+ let new_person_2 = PersonForm {
+ name: "sara".into(),
+ ..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(),
let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
+ let comment_form_2 = CommentForm {
+ content: "A test blocked comment".into(),
+ creator_id: inserted_person_2.id,
+ post_id: inserted_post.id,
+ parent_id: Some(inserted_comment.id),
+ ..CommentForm::default()
+ };
+
+ let inserted_comment_2 = Comment::create(&conn, &comment_form_2).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 expected_block = PersonBlock {
+ id: inserted_block.id,
+ person_id: inserted_person.id,
+ target_id: inserted_person_2.id,
+ published: inserted_block.published,
+ };
+
+ assert_eq!(expected_block, inserted_block);
+
let comment_like_form = CommentLikeForm {
comment_id: inserted_comment.id,
post_id: inserted_post.id,
my_vote: None,
subscribed: false,
saved: false,
+ creator_blocked: false,
comment: Comment {
id: inserted_comment.id,
content: "A test comment 32".into(),
inbox_url: inserted_person.inbox_url.to_owned(),
shared_inbox_url: None,
matrix_user_id: None,
+ ban_expires: None,
},
recipient: None,
post: Post {
nsfw: false,
embed_title: None,
embed_description: None,
- embed_html: None,
+ embed_video_url: None,
thumbnail_url: None,
ap_id: inserted_post.ap_id.to_owned(),
local: true,
description: None,
updated: None,
banner: None,
+ hidden: false,
+ posting_restricted_to_mods: false,
published: inserted_community.published,
},
counts: CommentAggregates {
.list()
.unwrap();
+ let read_comment_from_blocked_person =
+ CommentView::read(&conn, inserted_comment_2.id, Some(inserted_person.id)).unwrap();
+
let like_removed = CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap();
let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap();
+ Comment::delete(&conn, inserted_comment_2.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();
+
+ // Make sure its 1, not showing the blocked comment
+ assert_eq!(1, read_comment_views_with_person.len());
assert_eq!(
expected_comment_view_no_person,
- read_comment_views_no_person[0]
+ read_comment_views_no_person[1]
);
assert_eq!(
expected_comment_view_with_person,
read_comment_views_with_person[0]
);
+
+ // Make sure block set the creator blocked
+ assert!(read_comment_from_blocked_person.creator_blocked);
+
assert_eq!(1, num_deleted);
assert_eq!(1, like_removed);
}
projects / lemmy.git / blobdiff