Use enum for registration mode setting (#2604)

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

diff --git a/crates/api_crud/src/site/update.rs b/crates/api_crud/src/site/update.rs
index 40a356b6dde1e4663a544b2c59313a12ccbbe246..8cc852bb2fbbd41d9e29c497f4ab93f7ca691093 100644 (file)
--- a/crates/api_crud/src/site/update.rs
+++ b/crates/api_crud/src/site/update.rs
@@ -1,6 +1,7 @@
-use crate::PerformCrud;
+use crate::{site::check_application_question, PerformCrud};
 use actix_web::web::Data;
 use lemmy_api_common::{
+  context::LemmyContext,
   site::{EditSite, SiteResponse},
   utils::{
     get_local_user_view_from_jwt,
@@ -9,13 +10,14 @@ use lemmy_api_common::{
     local_site_to_slur_regex,
     site_description_length_check,
   },
+  websocket::UserOperationCrud,
 };
 use lemmy_db_schema::{
   source::{
     actor_language::SiteLanguage,
     federation_allowlist::FederationAllowList,
     federation_blocklist::FederationBlockList,
-    local_site::{LocalSite, LocalSiteUpdateForm},
+    local_site::{LocalSite, LocalSiteUpdateForm, RegistrationMode},
     local_site_rate_limit::{LocalSiteRateLimit, LocalSiteRateLimitUpdateForm},
     local_user::LocalUser,
     site::{Site, SiteUpdateForm},
@@ -26,12 +28,7 @@ use lemmy_db_schema::{
   ListingType,
 };
 use lemmy_db_views::structs::SiteView;
-use lemmy_utils::{
-  error::LemmyError,
-  utils::{check_application_question, check_slurs_opt},
-  ConnectionId,
-};
-use lemmy_websocket::{messages::SendAllMessage, LemmyContext, UserOperationCrud};
+use lemmy_utils::{error::LemmyError, utils::check_slurs_opt, ConnectionId};
 use std::str::FromStr;
 
 #[async_trait::async_trait(?Send)]
@@ -62,7 +59,12 @@ impl PerformCrud for EditSite {
     }
 
     let application_question = diesel_option_overwrite(&data.application_question);
-    check_application_question(&application_question, &data.require_application)?;
+    check_application_question(
+      &application_question,
+      data
+        .registration_mode
+        .unwrap_or(local_site.registration_mode),
+    )?;
 
     if let Some(default_post_listing_type) = &data.default_post_listing_type {
       // only allow all or local as default listing types
@@ -98,11 +100,10 @@ impl PerformCrud for EditSite {
 
     let local_site_form = LocalSiteUpdateForm::builder()
       .enable_downvotes(data.enable_downvotes)
-      .open_registration(data.open_registration)
+      .registration_mode(data.registration_mode)
       .enable_nsfw(data.enable_nsfw)
       .community_creation_admin_only(data.community_creation_admin_only)
       .require_email_verification(data.require_email_verification)
-      .require_application(data.require_application)
       .application_question(application_question)
       .private_instance(data.private_instance)
       .default_theme(data.default_theme.clone())
@@ -115,8 +116,6 @@ impl PerformCrud for EditSite {
       .actor_name_max_length(data.actor_name_max_length)
       .federation_enabled(data.federation_enabled)
       .federation_debug(data.federation_debug)
-      .federation_strict_allowlist(data.federation_strict_allowlist)
-      .federation_http_fetch_retry_limit(data.federation_http_fetch_retry_limit)
       .federation_worker_count(data.federation_worker_count)
       .captcha_enabled(data.captcha_enabled)
       .captcha_difficulty(data.captcha_difficulty.clone())
@@ -156,11 +155,13 @@ impl PerformCrud for EditSite {
     // will be able to log in. It really only wants this to be a requirement for NEW signups.
     // So if it was set from false, to true, you need to update all current users columns to be verified.
 
+    let old_require_application =
+      local_site.registration_mode == RegistrationMode::RequireApplication;
     let new_require_application = update_local_site
       .as_ref()
-      .map(|ols| ols.require_application)
+      .map(|ols| ols.registration_mode == RegistrationMode::RequireApplication)
       .unwrap_or(false);
-    if !local_site.require_application && new_require_application {
+    if !old_require_application && new_require_application {
       LocalUser::set_all_users_registration_applications_accepted(context.pool())
         .await
         .map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_registrations_accepted"))?;
@@ -176,7 +177,7 @@ impl PerformCrud for EditSite {
         .map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_email_verified"))?;
     }
 
-    let taglines = data.taglines.to_owned();
+    let taglines = data.taglines.clone();
     Tagline::replace(context.pool(), local_site.id, taglines).await?;
 
     let site_view = SiteView::read_local(context.pool()).await?;
@@ -190,11 +191,10 @@ impl PerformCrud for EditSite {
 
     let res = SiteResponse { site_view };
 
-    context.chat_server().do_send(SendAllMessage {
-      op: UserOperationCrud::EditSite,
-      response: res.clone(),
-      websocket_id,
-    });
+    context
+      .chat_server()
+      .send_all_message(UserOperationCrud::EditSite, &res, websocket_id)
+      .await?;
 
     Ok(res)
   }