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,
})
}
- // TODO: this function is only used by is_mod_or_admin() below, can probably be merged
- fn community_mods_and_admins(
- conn: &PgConnection,
- community_id: CommunityId,
- ) -> Result<Vec<PersonId>, Error> {
- let mut mods_and_admins: Vec<PersonId> = Vec::new();
- mods_and_admins.append(
- &mut CommunityModeratorView::for_community(conn, community_id)
- .map(|v| v.into_iter().map(|m| m.moderator.id).collect())?,
- );
- mods_and_admins.append(
- &mut PersonViewSafe::admins(conn).map(|v| v.into_iter().map(|a| a.person.id).collect())?,
- );
- Ok(mods_and_admins)
- }
-
pub fn is_mod_or_admin(
conn: &PgConnection,
person_id: PersonId,
community_id: CommunityId,
) -> bool {
- Self::community_mods_and_admins(conn, community_id)
+ let is_mod = CommunityModeratorView::for_community(conn, community_id)
+ .map(|v| {
+ v.into_iter()
+ .map(|m| m.moderator.id)
+ .collect::<Vec<PersonId>>()
+ })
+ .unwrap_or_default()
+ .contains(&person_id);
+ if is_mod {
+ return true;
+ }
+
+ PersonViewSafe::admins(conn)
+ .map(|v| {
+ v.into_iter()
+ .map(|a| a.person.id)
+ .collect::<Vec<PersonId>>()
+ })
.unwrap_or_default()
.contains(&person_id)
}
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
}
};
- 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)),
};
}
- // 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);