Adding diesel enums for SortType and ListingType (#2808)

[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 07e96582352085b16a2b534c301c829d86533b01..03ff590132212fcdab812b1f8ed6728b0b0fbee2 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,6 +10,7 @@ use lemmy_api_common::{
     local_site_to_slur_regex,
     site_description_length_check,
   },
+  websocket::UserOperationCrud,
 };
 use lemmy_db_schema::{
   source::{
@@ -24,15 +26,14 @@ use lemmy_db_schema::{
   traits::Crud,
   utils::{diesel_option_overwrite, diesel_option_overwrite_to_url, naive_now},
   ListingType,
+  RegistrationMode,
 };
 use lemmy_db_views::structs::SiteView;
 use lemmy_utils::{
   error::LemmyError,
-  utils::{check_application_question, check_slurs_opt},
+  utils::{slurs::check_slurs_opt, validation::is_valid_body_field},
   ConnectionId,
 };
-use lemmy_websocket::{messages::SendAllMessage, LemmyContext, UserOperationCrud};
-use std::str::FromStr;
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for EditSite {
@@ -47,7 +48,9 @@ impl PerformCrud for EditSite {
     let data: &EditSite = self;
     let local_user_view =
       get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
-    let local_site = LocalSite::read(context.pool()).await?;
+    let site_view = SiteView::read_local(context.pool()).await?;
+    let local_site = site_view.local_site;
+    let site = site_view.site;
 
     // Make sure user is an admin
     is_admin(&local_user_view)?;
@@ -61,22 +64,26 @@ impl PerformCrud for EditSite {
       site_description_length_check(desc)?;
     }
 
-    let application_question = diesel_option_overwrite(&data.application_question);
-    check_application_question(&application_question, &data.require_application)?;
+    is_valid_body_field(&data.sidebar)?;
 
-    if let Some(default_post_listing_type) = &data.default_post_listing_type {
+    let application_question = diesel_option_overwrite(&data.application_question);
+    check_application_question(
+      &application_question,
+      data
+        .registration_mode
+        .unwrap_or(local_site.registration_mode),
+    )?;
+
+    if let Some(listing_type) = &data.default_post_listing_type {
       // only allow all or local as default listing types
-      let val = ListingType::from_str(default_post_listing_type);
-      if val != Ok(ListingType::All) && val != Ok(ListingType::Local) {
+      if listing_type != &ListingType::All && listing_type != &ListingType::Local {
         return Err(LemmyError::from_message(
           "invalid_default_post_listing_type",
         ));
       }
     }
 
-    let site_id = local_site.site_id;
     if let Some(discussion_languages) = data.discussion_languages.clone() {
-      let site = Site::read(context.pool(), site_id).await?;
       SiteLanguage::update(context.pool(), discussion_languages.clone(), &site).await?;
     }
 
@@ -90,7 +97,7 @@ impl PerformCrud for EditSite {
       .updated(Some(Some(naive_now())))
       .build();
 
-    Site::update(context.pool(), site_id, &site_form)
+    Site::update(context.pool(), site.id, &site_form)
       .await
       // Ignore errors for all these, so as to not throw errors if no update occurs
       // Diesel will throw an error for empty update forms
@@ -98,15 +105,14 @@ 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())
-      .default_post_listing_type(data.default_post_listing_type.clone())
+      .default_post_listing_type(data.default_post_listing_type)
       .legal_information(diesel_option_overwrite(&data.legal_information))
       .application_email_admins(data.application_email_admins)
       .hide_modlog_mod_names(data.hide_modlog_mod_names)
@@ -118,6 +124,7 @@ impl PerformCrud for EditSite {
       .federation_worker_count(data.federation_worker_count)
       .captcha_enabled(data.captcha_enabled)
       .captcha_difficulty(data.captcha_difficulty.clone())
+      .reports_email_admins(data.reports_email_admins)
       .build();
 
     let update_local_site = LocalSite::update(context.pool(), &local_site_form)
@@ -154,11 +161,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"))?;
@@ -188,11 +197,7 @@ impl PerformCrud for EditSite {
 
     let res = SiteResponse { site_view };
 
-    context.chat_server().do_send(SendAllMessage {
-      op: UserOperationCrud::EditSite,
-      response: res.clone(),
-      websocket_id,
-    });
+    context.send_all_ws_message(&UserOperationCrud::EditSite, &res, websocket_id)?;
 
     Ok(res)
   }