Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show nsfw communities if you are logged in and searching communities #2105

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Show nsfw communities if you are logged in and searching communities #2105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca0e382
Show nsfw communities in logged in and you've enabled nsfw in your pr…
Feb 21, 2022
888b4a8
Reuse existing user check
Feb 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions crates/db_views_actor/src/community_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use lemmy_db_schema::{
fuzzy_search,
limit_and_offset,
newtypes::{CommunityId, PersonId},
schema::{community, community_aggregates, community_block, community_follower},
schema::{community, community_aggregates, community_block, community_follower, local_user},
source::{
community::{Community, CommunityFollower, CommunitySafe},
community_block::CommunityBlock,
Expand Down Expand Up @@ -167,6 +167,7 @@ impl<'a> CommunityQueryBuilder<'a> {

let mut query = community::table
.inner_join(community_aggregates::table)
.left_join(local_user::table.on(local_user::person_id.eq(person_id_join)))
.left_join(
community_follower::table.on(
community::id
Expand Down Expand Up @@ -232,10 +233,6 @@ impl<'a> CommunityQueryBuilder<'a> {
}
};

if !self.show_nsfw.unwrap_or(false) {
query = query.filter(community::nsfw.eq(false));
};

if let Some(listing_type) = self.listing_type {
query = match listing_type {
ListingType::Subscribed => query.filter(community_follower::person_id.is_not_null()), // TODO could be this: and(community_follower::person_id.eq(person_id_join)),
Expand All @@ -244,9 +241,15 @@ impl<'a> CommunityQueryBuilder<'a> {
};
}

// Don't show blocked communities
// Don't show blocked communities or nsfw communities if not enabled in profile
if self.my_person_id.is_some() {
query = query.filter(community_block::person_id.is_null());
query = query.filter(community::nsfw.eq(false).or(local_user::show_nsfw.eq(true)));
} else {
// No person in request, only show nsfw communities if show_nsfw passed into request
if !self.show_nsfw.unwrap_or(false) {
query = query.filter(community::nsfw.eq(false));
}
}

let (limit, offset) = limit_and_offset(self.page, self.limit);
Expand Down