fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-22 14:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow filtering out of deleted and removed comments when getting person details (#2446)

Browse source 
undefined
This commit is contained in:
kartikynwa 2022-09-21 07:03:33 +05:30 committed by GitHub
parent 004efd5d94
commit 4e6409f325
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/api_common/src/person.rs
View file

@ -99,6 +99,7 @@ pub struct GetPersonDetails {
pub limit: Option<i64>, pub limit: Option<i64>,
pub community_id: Option<CommunityId>, pub community_id: Option<CommunityId>,
pub saved_only: Option<bool>, pub saved_only: Option<bool>,
pub show_deleted_and_removed: Option<bool>,
pub auth: Option<Sensitive<String>>, pub auth: Option<Sensitive<String>>,
} }

2
crates/api_crud/src/user/read.rs
View file

@ -60,6 +60,7 @@ impl PerformCrud for GetPersonDetails {
let page = data.page; let page = data.page;
let limit = data.limit; let limit = data.limit;
let saved_only = data.saved_only; let saved_only = data.saved_only;
let show_deleted_and_removed = data.show_deleted_and_removed;
let community_id = data.community_id; let community_id = data.community_id;
let (posts, comments) = blocking(context.pool(), move |conn| { let (posts, comments) = blocking(context.pool(), move |conn| {
@ -77,6 +78,7 @@ impl PerformCrud for GetPersonDetails {
.local_user(local_user.as_ref()) .local_user(local_user.as_ref())
.sort(sort.map(post_to_comment_sort_type)) .sort(sort.map(post_to_comment_sort_type))
.saved_only(saved_only) .saved_only(saved_only)
.show_deleted_and_removed(show_deleted_and_removed)
.community_id(community_id) .community_id(community_id)
.page(page) .page(page)
.limit(limit); .limit(limit);

6
crates/db_views/src/comment_view.rs
View file

@ -165,6 +165,7 @@ pub struct CommentQuery<'a> {
local_user: Option<&'a LocalUser>, local_user: Option<&'a LocalUser>,
search_term: Option<String>, search_term: Option<String>,
saved_only: Option<bool>, saved_only: Option<bool>,
show_deleted_and_removed: Option<bool>,
page: Option<i64>, page: Option<i64>,
limit: Option<i64>, limit: Option<i64>,
max_depth: Option<i32>, max_depth: Option<i32>,
@ -302,6 +303,11 @@ impl<'a> CommentQuery<'a> {
query = query.filter(comment_saved::id.is_not_null()); 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) { if !self.local_user.map(|l| l.show_bot_accounts).unwrap_or(true) {
query = query.filter(person::bot_account.eq(false)); query = query.filter(person::bot_account.eq(false));
}; };