grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make moderators be able to see removed comments in communities they moderate

Browse source
This commit is contained in:
SleeplessOne1917 2023-09-18 19:09:17 -04:00
parent 7118200cab
commit f93d08a147
1 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ use lemmy_db_schema::{
person_block, person_block,
post, post,
}, },
source::community::CommunityFollower, source::{community::CommunityFollower, person::Person},
utils::{fuzzy_search, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn}, utils::{fuzzy_search, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn},
CommentSortType, CommentSortType,
ListingType, ListingType,
@ -190,33 +190,51 @@ fn queries<'a>() -> Queries<
query = query.filter(comment_like::score.eq(-1)); query = query.filter(comment_like::score.eq(-1));
} }
let is_admin = options
.local_user
.map(|l| l.local_user.admin)
.unwrap_or(false);
// only show deleted comments to creator, or if they have children // only show deleted comments to creator, or if they have children
if let Some(local_user) = options.local_user { if let Some(LocalUserView {
person: Person { id, .. },
..
}) = options.local_user
{
query = query.filter( query = query.filter(
comment::deleted comment::deleted
.eq(false) .eq(false)
.or(comment::creator_id.eq(local_user.person.id)) .or(comment::creator_id.eq(id))
.or(comment_aggregates::child_count.gt(0)), .or(comment_aggregates::child_count.gt(0)),
); );
if !is_admin {
query = query.filter(
comment::removed
.eq(false)
.or(comment_aggregates::child_count.gt(0))
.or(
post::id
.eq(comment::post_id)
.and(post::community_id.eq(community_moderator::community_id))
.and(community_moderator::person_id.eq(id)),
),
);
}
} else { } else {
query = query.filter( query = query.filter(
comment::deleted comment::deleted
.eq(false) .eq(false)
.or(comment_aggregates::child_count.gt(0)), .or(comment_aggregates::child_count.gt(0)),
); );
}
let is_admin = options if !is_admin {
.local_user query = query.filter(
.map(|l| l.local_user.admin) comment::removed
.unwrap_or(false); .eq(false)
// only show removed comments to admin when viewing user profile .or(comment_aggregates::child_count.gt(0)),
if !(options.is_profile_view && is_admin) { );
query = query.filter( }
comment::removed
.eq(false)
.or(comment_aggregates::child_count.gt(0)),
);
} }
if !options if !options