add new flag to api (#3363)

[lemmy.git] / crates / api_crud / src / community / list.rs

diff --git a/crates/api_crud/src/community/list.rs b/crates/api_crud/src/community/list.rs
index 24c154ad2a2ffbcb58bcdc313ae6714a2daa2471..d37dd2dc2cfb74ffbc22c09c9cb5a8d1330bb0b9 100644 (file)
--- a/crates/api_crud/src/community/list.rs
+++ b/crates/api_crud/src/community/list.rs
@@ -1,72 +1,48 @@
 use crate::PerformCrud;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  check_private_instance,
-  community::*,
-  get_local_user_view_from_jwt_opt,
+  community::{ListCommunities, ListCommunitiesResponse},
+  context::LemmyContext,
+  utils::{check_private_instance, is_admin, local_user_view_from_jwt_opt},
 };
-use lemmy_db_schema::{
-  from_opt_str_to_opt_enum,
-  traits::DeleteableOrRemoveable,
-  ListingType,
-  SortType,
-};
-use lemmy_db_views_actor::community_view::CommunityQueryBuilder;
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_schema::source::local_site::LocalSite;
+use lemmy_db_views_actor::community_view::CommunityQuery;
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for ListCommunities {
   type Response = ListCommunitiesResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
+  #[tracing::instrument(skip(context))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
   ) -> Result<ListCommunitiesResponse, LemmyError> {
     let data: &ListCommunities = self;
-    let local_user_view =
-      get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
-        .await?;
-
-    check_private_instance(&local_user_view, context.pool()).await?;
-
-    let person_id = local_user_view.to_owned().map(|l| l.person.id);
+    let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), context).await;
+    let local_site = LocalSite::read(context.pool()).await?;
+    let is_admin = local_user_view.as_ref().map(|luv| is_admin(luv).is_ok());
 
-    // Don't show NSFW by default
-    let show_nsfw = match &local_user_view {
-      Some(uv) => uv.local_user.show_nsfw,
-      None => false,
-    };
-
-    let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
-    let listing_type: Option<ListingType> = from_opt_str_to_opt_enum(&data.type_);
+    check_private_instance(&local_user_view, &local_site)?;
 
+    let sort = data.sort;
+    let listing_type = data.type_;
+    let show_nsfw = data.show_nsfw;
     let page = data.page;
     let limit = data.limit;
-    let mut communities = blocking(context.pool(), move |conn| {
-      CommunityQueryBuilder::create(conn)
-        .listing_type(listing_type)
-        .sort(sort)
-        .show_nsfw(show_nsfw)
-        .my_person_id(person_id)
-        .page(page)
-        .limit(limit)
-        .list()
-    })
-    .await??;
-
-    // Blank out deleted or removed info for non-logged in users
-    if person_id.is_none() {
-      for cv in communities
-        .iter_mut()
-        .filter(|cv| cv.community.deleted || cv.community.removed)
-      {
-        cv.community = cv.to_owned().community.blank_out_deleted_or_removed_info();
-      }
-    }
+    let local_user = local_user_view.map(|l| l.local_user);
+    let communities = CommunityQuery::builder()
+      .pool(context.pool())
+      .listing_type(listing_type)
+      .show_nsfw(show_nsfw)
+      .sort(sort)
+      .local_user(local_user.as_ref())
+      .page(page)
+      .limit(limit)
+      .is_mod_or_admin(is_admin)
+      .build()
+      .list()
+      .await?;
 
     // Return the jwt
     Ok(ListCommunitiesResponse { communities })