Moving settings to Database. (#2492)

[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 7afb61783061078af6c639ffe2c7a47142afb3c4..dcf5886aea1f0ca2c509513aa166b1f6f3a94ea3 100644 (file)
--- a/crates/api_crud/src/community/list.rs
+++ b/crates/api_crud/src/community/list.rs
@@ -4,8 +4,8 @@ use lemmy_api_common::{
   community::{ListCommunities, ListCommunitiesResponse},
   utils::{blocking, check_private_instance, get_local_user_view_from_jwt_opt},
 };
-use lemmy_db_schema::traits::DeleteableOrRemoveable;
-use lemmy_db_views_actor::community_view::CommunityQueryBuilder;
+use lemmy_db_schema::{source::local_site::LocalSite, traits::DeleteableOrRemoveable};
+use lemmy_db_views_actor::community_view::CommunityQuery;
 use lemmy_utils::{error::LemmyError, ConnectionId};
 use lemmy_websocket::LemmyContext;
 
@@ -23,29 +23,26 @@ impl PerformCrud for ListCommunities {
     let local_user_view =
       get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
         .await?;
+    let local_site = blocking(context.pool(), LocalSite::read).await??;
 
-    check_private_instance(&local_user_view, context.pool()).await?;
+    check_private_instance(&local_user_view, &local_site)?;
 
     let person_id = local_user_view.to_owned().map(|l| l.person.id);
 
-    // Don't show NSFW by default
-    let show_nsfw = match &local_user_view {
-      Some(uv) => uv.local_user.show_nsfw,
-      None => false,
-    };
-
     let sort = data.sort;
     let listing_type = data.type_;
     let page = data.page;
     let limit = data.limit;
+    let local_user = local_user_view.map(|l| l.local_user);
     let mut communities = blocking(context.pool(), move |conn| {
-      CommunityQueryBuilder::create(conn)
+      CommunityQuery::builder()
+        .conn(conn)
         .listing_type(listing_type)
         .sort(sort)
-        .show_nsfw(show_nsfw)
-        .my_person_id(person_id)
+        .local_user(local_user.as_ref())
         .page(page)
         .limit(limit)
+        .build()
         .list()
     })
     .await??;