Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / api_crud / src / community / create.rs

diff --git a/crates/api_crud/src/community/create.rs b/crates/api_crud/src/community/create.rs
index 451e9bfa0cbfad12b628331df20077359df44a27..a0c40457a2d3ca952971f0f9d1cf8dcbc7a45b54 100644 (file)
--- a/crates/api_crud/src/community/create.rs
+++ b/crates/api_crud/src/community/create.rs
@@ -1,4 +1,5 @@
 use crate::PerformCrud;
+use activitypub_federation::core::{object_id::ObjectId, signatures::generate_actor_keypair};
 use actix_web::web::Data;
 use lemmy_api_common::{
   community::{CommunityResponse, CreateCommunity},
@@ -12,7 +13,6 @@ use lemmy_apub::{
   objects::community::ApubCommunity,
   EndpointType,
 };
-use lemmy_apub_lib::object_id::ObjectId;
 use lemmy_db_schema::{
   source::{
     community::{
@@ -26,14 +26,13 @@ use lemmy_db_schema::{
     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::{
-  apub::generate_actor_keypair,
+  error::LemmyError,
   utils::{check_slurs, check_slurs_opt, is_valid_actor_name},
   ConnectionId,
-  LemmyError,
 };
 use lemmy_websocket::LemmyContext;
 
@@ -61,6 +60,7 @@ impl PerformCrud for CreateCommunity {
     // 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())?;
@@ -88,13 +88,13 @@ impl PerformCrud for CreateCommunity {
     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)?)),
@@ -114,7 +114,7 @@ impl PerformCrud for CreateCommunity {
       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"))?;
@@ -123,10 +123,10 @@ impl PerformCrud for CreateCommunity {
     let community_follower_form = CommunityFollowerForm {
       community_id: inserted_community.id,
       person_id: local_user_view.person.id,
-      pending: Some(false),
+      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"))?;