use crate::PerformCrud;
+use activitypub_federation::core::{object_id::ObjectId, signatures::generate_actor_keypair};
use actix_web::web::Data;
use lemmy_api_common::{
- blocking,
- check_image_has_local_domain,
community::{CommunityResponse, CreateCommunity},
- get_local_user_view_from_jwt,
- is_admin,
+ utils::{blocking, get_local_user_view_from_jwt, is_admin},
};
use lemmy_apub::{
generate_followers_url,
objects::community::ApubCommunity,
EndpointType,
};
-use lemmy_apub_lib::object_id::ObjectId;
use lemmy_db_schema::{
- diesel_option_overwrite_to_url,
source::{
community::{
Community,
site::Site,
},
traits::{Crud, Followable, Joinable},
+ utils::{diesel_option_overwrite, diesel_option_overwrite_to_url},
};
-use lemmy_db_views_actor::community_view::CommunityView;
+use lemmy_db_views_actor::structs::CommunityView;
use lemmy_utils::{
- apub::generate_actor_keypair,
+ error::LemmyError,
utils::{check_slurs, check_slurs_opt, is_valid_actor_name},
ConnectionId,
- LemmyError,
};
use lemmy_websocket::LemmyContext;
));
}
+ // Check to make sure the icon and banners are urls
+ let icon = diesel_option_overwrite_to_url(&data.icon)?;
+ let banner = diesel_option_overwrite_to_url(&data.banner)?;
+ let description = diesel_option_overwrite(&data.description);
+
check_slurs(&data.name, &context.settings().slur_regex())?;
check_slurs(&data.title, &context.settings().slur_regex())?;
check_slurs_opt(&data.description, &context.settings().slur_regex())?;
- check_image_has_local_domain(&data.icon)?;
- check_image_has_local_domain(&data.banner)?;
if !is_valid_actor_name(&data.name, context.settings().actor_name_max_length) {
return Err(LemmyError::from_message("invalid_community_name"));
return Err(LemmyError::from_message("community_already_exists"));
}
- // Check to make sure the icon and banners are urls
- let icon = diesel_option_overwrite_to_url(&data.icon)?;
- let banner = diesel_option_overwrite_to_url(&data.banner)?;
-
// When you create a community, make sure the user becomes a moderator and a follower
let keypair = generate_actor_keypair()?;
let community_form = CommunityForm {
name: data.name.to_owned(),
title: data.title.to_owned(),
- description: data.description.to_owned(),
+ description,
icon,
banner,
nsfw: data.nsfw,
actor_id: Some(community_actor_id.to_owned()),
private_key: Some(Some(keypair.private_key)),
- public_key: keypair.public_key,
+ public_key: Some(keypair.public_key),
followers_url: Some(generate_followers_url(&community_actor_id)?),
inbox_url: Some(generate_inbox_url(&community_actor_id)?),
shared_inbox_url: Some(Some(generate_shared_inbox_url(&community_actor_id)?)),
+ posting_restricted_to_mods: data.posting_restricted_to_mods,
..CommunityForm::default()
};
person_id: local_user_view.person.id,
};
- let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
+ let join = move |conn: &mut _| CommunityModerator::join(conn, &community_moderator_form);
blocking(context.pool(), join)
.await?
.map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
pending: false,
};
- let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
+ let follow = move |conn: &mut _| CommunityFollower::follow(conn, &community_follower_form);
blocking(context.pool(), follow)
.await?
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;