-use crate::{community::send_community_websocket, PerformCrud};
+use crate::PerformCrud;
use actix_web::web::Data;
use lemmy_api_common::{
blocking,
community::{CommunityResponse, EditCommunity},
get_local_user_view_from_jwt,
};
-use lemmy_apub::CommunityType;
-use lemmy_db_queries::{diesel_option_overwrite_to_url, Crud};
+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},
- PersonId,
+ traits::Crud,
};
-use lemmy_db_views_actor::{
- community_moderator_view::CommunityModeratorView,
- community_view::CommunityView,
-};
-use lemmy_utils::{
- utils::{check_slurs, check_slurs_opt},
- ApiError,
- ConnectionId,
- LemmyError,
-};
-use lemmy_websocket::{LemmyContext, UserOperationCrud};
+use lemmy_db_views_actor::community_moderator_view::CommunityModeratorView;
+use lemmy_utils::{utils::check_slurs_opt, ApiError, ConnectionId, LemmyError};
+use lemmy_websocket::{send::send_community_ws_message, LemmyContext, UserOperationCrud};
#[async_trait::async_trait(?Send)]
impl PerformCrud for EditCommunity {
context: &Data<LemmyContext>,
websocket_id: Option<ConnectionId>,
) -> Result<CommunityResponse, LemmyError> {
- let data: &EditCommunity = &self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let data: &EditCommunity = self;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
- check_slurs(&data.title)?;
- check_slurs_opt(&data.description)?;
+ check_slurs_opt(&data.title, &context.settings().slur_regex())?;
+ check_slurs_opt(&data.description, &context.settings().slur_regex())?;
// Verify its a mod (only mods can edit it)
let community_id = data.community_id;
})
.await??;
if !mods.contains(&local_user_view.person.id) {
- return Err(ApiError::err("not_a_moderator").into());
+ return Err(ApiError::err_plain("not_a_moderator").into());
}
let community_id = data.community_id;
let community_form = CommunityForm {
name: read_community.name,
- title: data.title.to_owned(),
+ 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,
Community::update(conn, community_id, &community_form)
})
.await?
- .map_err(|_| ApiError::err("couldnt_update_community"))?;
-
- updated_community
- .send_update(local_user_view.person.to_owned(), context)
- .await?;
-
- let community_id = data.community_id;
- let person_id = local_user_view.person.id;
- let community_view = blocking(context.pool(), move |conn| {
- CommunityView::read(conn, community_id, Some(person_id))
- })
- .await??;
-
- let res = CommunityResponse { community_view };
+ .map_err(|e| ApiError::err("couldnt_update_community", e))?;
- send_community_websocket(
- &res,
+ UpdateCommunity::send(
+ updated_community.into(),
+ &local_user_view.person.into(),
context,
- websocket_id,
- UserOperationCrud::EditCommunity,
- );
+ )
+ .await?;
- Ok(res)
+ let op = UserOperationCrud::EditCommunity;
+ send_community_ws_message(data.community_id, op, websocket_id, None, context).await
}
}