use crate::PerformCrud;
use actix_web::web::Data;
use lemmy_api_common::{
+ build_response::build_community_response,
community::{CommunityResponse, RemoveCommunity},
context::LemmyContext,
- utils::{get_local_user_view_from_jwt, is_admin},
- websocket::{send::send_community_ws_message, UserOperationCrud},
+ utils::{is_admin, local_user_view_from_jwt},
};
use lemmy_db_schema::{
source::{
},
traits::Crud,
};
-use lemmy_utils::{error::LemmyError, utils::time::naive_from_unix, ConnectionId};
+use lemmy_utils::{
+ error::{LemmyError, LemmyErrorExt, LemmyErrorType},
+ utils::time::naive_from_unix,
+};
#[async_trait::async_trait(?Send)]
impl PerformCrud for RemoveCommunity {
type Response = CommunityResponse;
- #[tracing::instrument(skip(context, websocket_id))]
- async fn perform(
- &self,
- context: &Data<LemmyContext>,
- websocket_id: Option<ConnectionId>,
- ) -> Result<CommunityResponse, LemmyError> {
+ #[tracing::instrument(skip(context))]
+ async fn perform(&self, context: &Data<LemmyContext>) -> Result<CommunityResponse, LemmyError> {
let data: &RemoveCommunity = 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?;
// Verify its an admin (only an admin can remove a community)
is_admin(&local_user_view)?;
let community_id = data.community_id;
let removed = data.removed;
Community::update(
- context.pool(),
+ &mut context.pool(),
community_id,
&CommunityUpdateForm::builder()
.removed(Some(removed))
.build(),
)
.await
- .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_community"))?;
+ .with_lemmy_type(LemmyErrorType::CouldntUpdateCommunity)?;
// Mod tables
let expires = data.expires.map(naive_from_unix);
reason: data.reason.clone(),
expires,
};
- ModRemoveCommunity::create(context.pool(), &form).await?;
-
- let res = send_community_ws_message(
- data.community_id,
- UserOperationCrud::RemoveCommunity,
- websocket_id,
- Some(local_user_view.person.id),
- context,
- )
- .await?;
+ ModRemoveCommunity::create(&mut context.pool(), &form).await?;
- Ok(res)
+ build_community_response(context, local_user_view, community_id).await
}
}