X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi_crud%2Fsrc%2Fcommunity%2Fupdate.rs;h=6a98180b4fa9f31bfd99521a3b66e0c4814a6fa8;hb=7058cfa1cf67e65818e8ce62d9716b1564558734;hp=b3b89368eec538507add3d2dad6ce7fb7fb34b3f;hpb=9c1b9ff3cf198d829630d3d4ab0c03985ecc732f;p=lemmy.git diff --git a/crates/api_crud/src/community/update.rs b/crates/api_crud/src/community/update.rs index b3b89368..6a98180b 100644 --- a/crates/api_crud/src/community/update.rs +++ b/crates/api_crud/src/community/update.rs @@ -3,19 +3,15 @@ use actix_web::web::Data; use lemmy_api_common::{ blocking, check_image_has_local_domain, - community::{CommunityResponse, EditCommunity, HideCommunity}, + community::{CommunityResponse, EditCommunity}, get_local_user_view_from_jwt, - is_admin, }; use lemmy_apub::protocol::activities::community::update::UpdateCommunity; use lemmy_db_schema::{ diesel_option_overwrite_to_url, naive_now, newtypes::PersonId, - source::{ - community::{Community, CommunityForm}, - moderator::{ModHideCommunity, ModHideCommunityForm}, - }, + source::community::{Community, CommunityForm}, traits::Crud, }; use lemmy_db_views_actor::community_moderator_view::CommunityModeratorView; @@ -65,11 +61,9 @@ impl PerformCrud for EditCommunity { name: read_community.name, title: data.title.to_owned().unwrap_or(read_community.title), description: data.description.to_owned(), - public_key: read_community.public_key, icon, banner, nsfw: data.nsfw, - hidden: Some(read_community.hidden), updated: Some(naive_now()), ..CommunityForm::default() }; @@ -92,70 +86,3 @@ impl PerformCrud for EditCommunity { send_community_ws_message(data.community_id, op, websocket_id, None, context).await } } - -#[async_trait::async_trait(?Send)] -impl PerformCrud for HideCommunity { - type Response = CommunityResponse; - - #[tracing::instrument(skip(context, websocket_id))] - async fn perform( - &self, - context: &Data, - websocket_id: Option, - ) -> Result { - let data: &HideCommunity = self; - - // Verify its a admin (only admin can hide or unhide it) - let local_user_view = - get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?; - is_admin(&local_user_view)?; - - let community_id = data.community_id; - let read_community = blocking(context.pool(), move |conn| { - Community::read(conn, community_id) - }) - .await??; - - let community_form = CommunityForm { - name: read_community.name, - title: read_community.title, - description: read_community.description.to_owned(), - public_key: read_community.public_key, - icon: Some(read_community.icon), - banner: Some(read_community.banner), - nsfw: Some(read_community.nsfw), - updated: Some(naive_now()), - hidden: Some(data.hidden), - ..CommunityForm::default() - }; - - let mod_hide_community_form = ModHideCommunityForm { - community_id: data.community_id, - mod_person_id: local_user_view.person.id, - reason: data.reason.clone(), - hidden: Some(data.hidden), - }; - - let community_id = data.community_id; - let updated_community = blocking(context.pool(), move |conn| { - Community::update(conn, community_id, &community_form) - }) - .await? - .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_community_hidden_status"))?; - - blocking(context.pool(), move |conn| { - ModHideCommunity::create(conn, &mod_hide_community_form) - }) - .await??; - - UpdateCommunity::send( - updated_community.into(), - &local_user_view.person.into(), - context, - ) - .await?; - - let op = UserOperationCrud::EditCommunity; - send_community_ws_message(data.community_id, op, websocket_id, None, context).await - } -}