use crate::Perform;
use actix_web::web::Data;
use lemmy_api_common::{
- blocking,
community::{BlockCommunity, BlockCommunityResponse},
- get_local_user_view_from_jwt,
+ context::LemmyContext,
+ utils::local_user_view_from_jwt,
};
-use lemmy_apub::protocol::activities::following::undo_follow::UndoFollowCommunity;
use lemmy_db_schema::{
source::{
- community::{Community, CommunityFollower, CommunityFollowerForm},
+ community::{CommunityFollower, CommunityFollowerForm},
community_block::{CommunityBlock, CommunityBlockForm},
},
- traits::{Blockable, Crud, Followable},
+ traits::{Blockable, Followable},
};
-use lemmy_db_views_actor::community_view::CommunityView;
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_views_actor::structs::CommunityView;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
#[async_trait::async_trait(?Send)]
impl Perform for BlockCommunity {
type Response = BlockCommunityResponse;
- #[tracing::instrument(skip(context, _websocket_id))]
+ #[tracing::instrument(skip(context))]
async fn perform(
&self,
context: &Data<LemmyContext>,
- _websocket_id: Option<ConnectionId>,
) -> Result<BlockCommunityResponse, LemmyError> {
let data: &BlockCommunity = self;
- let local_user_view =
- get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+ let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let community_id = data.community_id;
let person_id = local_user_view.person.id;
};
if data.block {
- let block = move |conn: &'_ _| CommunityBlock::block(conn, &community_block_form);
- blocking(context.pool(), block)
- .await?
- .map_err(|e| LemmyError::from_error_message(e, "community_block_already_exists"))?;
+ CommunityBlock::block(&mut context.pool(), &community_block_form)
+ .await
+ .with_lemmy_type(LemmyErrorType::CommunityBlockAlreadyExists)?;
// Also, unfollow the community, and send a federated unfollow
let community_follower_form = CommunityFollowerForm {
person_id,
pending: false,
};
- blocking(context.pool(), move |conn: &'_ _| {
- CommunityFollower::unfollow(conn, &community_follower_form)
- })
- .await?
- .ok();
- let community = blocking(context.pool(), move |conn| {
- Community::read(conn, community_id)
- })
- .await??;
- UndoFollowCommunity::send(&local_user_view.person.into(), &community.into(), context).await?;
+
+ CommunityFollower::unfollow(&mut context.pool(), &community_follower_form)
+ .await
+ .ok();
} else {
- let unblock = move |conn: &'_ _| CommunityBlock::unblock(conn, &community_block_form);
- blocking(context.pool(), unblock)
- .await?
- .map_err(|e| LemmyError::from_error_message(e, "community_block_already_exists"))?;
+ CommunityBlock::unblock(&mut context.pool(), &community_block_form)
+ .await
+ .with_lemmy_type(LemmyErrorType::CommunityBlockAlreadyExists)?;
}
- let community_view = blocking(context.pool(), move |conn| {
- CommunityView::read(conn, community_id, Some(person_id))
- })
- .await??;
+ let community_view =
+ CommunityView::read(&mut context.pool(), community_id, Some(person_id), None).await?;
Ok(BlockCommunityResponse {
blocked: data.block,