X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi%2Fsrc%2Fsite%2Fpurge%2Fcommunity.rs;h=bd8d9d386829467f0fabae6f57788cd4f044e217;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=5bdf62e75bb154187da9d9d646281bec1296aeeb;hpb=a5707328cff0133373491ef8e8908faeefacfa30;p=lemmy.git diff --git a/crates/api/src/site/purge/community.rs b/crates/api/src/site/purge/community.rs index 5bdf62e7..bd8d9d38 100644 --- a/crates/api/src/site/purge/community.rs +++ b/crates/api/src/site/purge/community.rs @@ -4,7 +4,7 @@ use lemmy_api_common::{ context::LemmyContext, request::purge_image_from_pictrs, site::{PurgeCommunity, PurgeItemResponse}, - utils::{is_top_admin, local_user_view_from_jwt, purge_image_posts_for_community}, + utils::{is_admin, local_user_view_from_jwt, purge_image_posts_for_community, sanitize_html_opt}, }; use lemmy_db_schema::{ source::{ @@ -13,28 +13,24 @@ use lemmy_db_schema::{ }, traits::Crud, }; -use lemmy_utils::{error::LemmyError, ConnectionId}; +use lemmy_utils::error::LemmyError; #[async_trait::async_trait(?Send)] impl Perform for PurgeCommunity { type Response = PurgeItemResponse; - #[tracing::instrument(skip(context, _websocket_id))] - async fn perform( - &self, - context: &Data, - _websocket_id: Option, - ) -> Result { + #[tracing::instrument(skip(context))] + async fn perform(&self, context: &Data) -> Result { let data: &Self = self; let local_user_view = local_user_view_from_jwt(&data.auth, context).await?; - // Only let the top admin purge an item - is_top_admin(context.pool(), local_user_view.person.id).await?; + // Only let admin purge an item + is_admin(&local_user_view)?; let community_id = data.community_id; // Read the community to get its images - let community = Community::read(context.pool(), community_id).await?; + let community = Community::read(&mut context.pool(), community_id).await?; if let Some(banner) = community.banner { purge_image_from_pictrs(context.client(), context.settings(), &banner) @@ -50,22 +46,22 @@ impl Perform for PurgeCommunity { purge_image_posts_for_community( community_id, - context.pool(), + &mut context.pool(), context.settings(), context.client(), ) .await?; - Community::delete(context.pool(), community_id).await?; + Community::delete(&mut context.pool(), community_id).await?; // Mod tables - let reason = data.reason.clone(); + let reason = sanitize_html_opt(&data.reason); let form = AdminPurgeCommunityForm { admin_person_id: local_user_view.person.id, reason, }; - AdminPurgeCommunity::create(context.pool(), &form).await?; + AdminPurgeCommunity::create(&mut context.pool(), &form).await?; Ok(PurgeItemResponse { success: true }) }