site::Site,
},
traits::{Crud, Followable, Joinable},
- utils::diesel_option_overwrite_to_url,
+ utils::{diesel_option_overwrite, diesel_option_overwrite_to_url},
};
use lemmy_db_views_actor::structs::CommunityView;
use lemmy_utils::{
// 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())?;
&context.settings().get_protocol_and_hostname(),
)?;
let community_actor_id_wrapped = ObjectId::<ApubCommunity>::new(community_actor_id.clone());
- let community_dupe = community_actor_id_wrapped
- .dereference_local::<LemmyError>(context)
- .await;
+ let community_dupe = community_actor_id_wrapped.dereference_local(context).await;
if community_dupe.is_ok() {
return Err(LemmyError::from_message("community_already_exists"));
}
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)?)),
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"))?;