Remove `actix_rt` & use standard tokio spawn (#3158)

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

diff --git a/crates/api_crud/src/site/create.rs b/crates/api_crud/src/site/create.rs
index 05b41e35a4dea510f04548fb464275c9450da5b3..a1669baef0341569f1590fbb810a2ad6c85c37af 100644 (file)
--- a/crates/api_crud/src/site/create.rs
+++ b/crates/api_crud/src/site/create.rs
@@ -29,9 +29,8 @@ use lemmy_utils::{
   error::LemmyError,
   utils::{
     slurs::{check_slurs, check_slurs_opt},
-    validation::is_valid_body_field,
+    validation::{check_site_visibility_valid, is_valid_body_field},
   },
-  ConnectionId,
 };
 use url::Url;
 
@@ -39,12 +38,8 @@ use url::Url;
 impl PerformCrud for CreateSite {
   type Response = SiteResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<SiteResponse, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<SiteResponse, LemmyError> {
     let data: &CreateSite = self;
 
     let local_site = LocalSite::read(context.pool()).await?;
@@ -55,6 +50,16 @@ impl PerformCrud for CreateSite {
 
     let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
 
+    // Make sure user is an admin
+    is_admin(&local_user_view)?;
+
+    check_site_visibility_valid(
+      local_site.private_instance,
+      local_site.federation_enabled,
+      &data.private_instance,
+      &data.federation_enabled,
+    )?;
+
     let sidebar = diesel_option_overwrite(&data.sidebar);
     let description = diesel_option_overwrite(&data.description);
     let icon = diesel_option_overwrite_to_url(&data.icon)?;
@@ -64,9 +69,6 @@ impl PerformCrud for CreateSite {
     check_slurs(&data.name, &slur_regex)?;
     check_slurs_opt(&data.description, &slur_regex)?;
 
-    // Make sure user is an admin
-    is_admin(&local_user_view)?;
-
     if let Some(Some(desc)) = &description {
       site_description_length_check(desc)?;
     }
@@ -120,8 +122,6 @@ impl PerformCrud for CreateSite {
       .slur_filter_regex(diesel_option_overwrite(&data.slur_filter_regex))
       .actor_name_max_length(data.actor_name_max_length)
       .federation_enabled(data.federation_enabled)
-      .federation_debug(data.federation_debug)
-      .federation_worker_count(data.federation_worker_count)
       .captcha_enabled(data.captcha_enabled)
       .captcha_difficulty(data.captcha_difficulty.clone())
       .build();