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},
+ utils::{blocking, check_private_instance, get_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_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;
#[async_trait::async_trait(?Send)]
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: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
- let listing_type: Option<ListingType> = from_opt_str_to_opt_enum(&data.type_);
-
+ 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??;