mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-26 03:11:08 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse source
This commit is contained in:
dull b 2023-07-03 18:19:50 +00:00
parent 8f46003ebc
commit 2c47ac35a0
5 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/api/src/community/follow.rs
View file

@ -34,7 +34,12 @@ impl Perform for FollowCommunity {
if data.follow { if data.follow {
if community.local { if community.local {
check_community_ban(local_user_view.person.id, community_id, context.conn().await?).await?; check_community_ban(
local_user_view.person.id,
community_id,
context.conn().await?,
)
.await?;
check_community_deleted_or_removed(community_id, context.conn().await?).await?; check_community_deleted_or_removed(community_id, context.conn().await?).await?;
CommunityFollower::follow(context.conn().await?, &community_follower_form) CommunityFollower::follow(context.conn().await?, &community_follower_form)

2
crates/apub/src/api/list_comments.rs
View file

@ -23,7 +23,7 @@ pub async fn list_comments(
context: Data<LemmyContext>, context: Data<LemmyContext>,
) -> Result<Json<GetCommentsResponse>, LemmyError> { ) -> Result<Json<GetCommentsResponse>, LemmyError> {
let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), &context).await; 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 local_site = LocalSite::read(context.conn().await?).await?;
check_private_instance(&local_user_view, &local_site)?; check_private_instance(&local_user_view, &local_site)?;
let community_id = if let Some(name) = &data.community_name { let community_id = if let Some(name) = &data.community_name {

8
crates/apub/src/api/list_posts.rs
View file

@ -20,7 +20,7 @@ pub async fn list_posts(
context: Data<LemmyContext>, context: Data<LemmyContext>,
) -> Result<Json<GetPostsResponse>, LemmyError> { ) -> Result<Json<GetPostsResponse>, LemmyError> {
let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), &context).await; 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 local_site = LocalSite::read(context.conn().await?).await?;
check_private_instance(&local_user_view, &local_site)?; check_private_instance(&local_user_view, &local_site)?;
@ -40,7 +40,11 @@ pub async fn list_posts(
let listing_type = listing_type_with_default(data.type_, &local_site, community_id)?; let listing_type = listing_type_with_default(data.type_, &local_site, community_id)?;
let is_mod_or_admin = is_mod_or_admin_opt(context.pool(), local_user_view.as_ref(), community_id) let is_mod_or_admin = is_mod_or_admin_opt(
context.conn().await?,
local_user_view.as_ref(),
community_id,
)
.await .await
.is_ok(); .is_ok();

9
crates/apub/src/api/read_community.rs
View file

@ -42,8 +42,11 @@ pub async fn read_community(
} }
}; };
let is_mod_or_admin = let is_mod_or_admin = is_mod_or_admin_opt(
is_mod_or_admin_opt(context.conn().await?, local_user_view.as_ref(), Some(community_id)) context.conn().await?,
local_user_view.as_ref(),
Some(community_id),
)
.await .await
.is_ok(); .is_ok();
@ -56,7 +59,7 @@ pub async fn read_community(
.await .await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?; .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?;
let moderators = CommunityModeratorView::for_community(context.pool(), community_id) let moderators = CommunityModeratorView::for_community(context.conn().await?, community_id)
.await .await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?; .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?;

3
crates/apub/src/api/read_person.rs
View file

@ -102,7 +102,8 @@ pub async fn read_person(
} }
.await?; .await?;
let moderates = CommunityModeratorView::for_person(context.conn().await?, person_details_id).await?; let moderates =
CommunityModeratorView::for_person(context.conn().await?, person_details_id).await?;
// Return the jwt // Return the jwt
Ok(Json(GetPersonDetailsResponse { Ok(Json(GetPersonDetailsResponse {