Add support for Taglines (#2548)

[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 2f0503952426f602de190297285c63fabeac8889..40a356b6dde1e4663a544b2c59313a12ccbbe246 100644 (file)
--- a/crates/api_crud/src/site/update.rs
+++ b/crates/api_crud/src/site/update.rs
@@ -3,9 +3,9 @@ use actix_web::web::Data;
 use lemmy_api_common::{
   site::{EditSite, SiteResponse},
   utils::{
-    blocking,
     get_local_user_view_from_jwt,
     is_admin,
+    local_site_rate_limit_to_rate_limit_config,
     local_site_to_slur_regex,
     site_description_length_check,
   },
@@ -19,6 +19,7 @@ use lemmy_db_schema::{
     local_site_rate_limit::{LocalSiteRateLimit, LocalSiteRateLimitUpdateForm},
     local_user::LocalUser,
     site::{Site, SiteUpdateForm},
+    tagline::Tagline,
   },
   traits::Crud,
   utils::{diesel_option_overwrite, diesel_option_overwrite_to_url, naive_now},
@@ -46,7 +47,7 @@ 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 = blocking(context.pool(), LocalSite::read).await??;
+    let local_site = LocalSite::read(context.pool()).await?;
 
     // Make sure user is an admin
     is_admin(&local_user_view)?;
@@ -75,14 +76,11 @@ impl PerformCrud for EditSite {
 
     let site_id = local_site.site_id;
     if let Some(discussion_languages) = data.discussion_languages.clone() {
-      blocking(context.pool(), move |conn| {
-        let site = Site::read(conn, site_id)?;
-        SiteLanguage::update(conn, discussion_languages, &site)
-      })
-      .await??;
+      let site = Site::read(context.pool(), site_id).await?;
+      SiteLanguage::update(context.pool(), discussion_languages.clone(), &site).await?;
     }
 
-    let name = data.name.to_owned();
+    let name = data.name.clone();
     let site_form = SiteUpdateForm::builder()
       .name(name)
       .sidebar(diesel_option_overwrite(&data.sidebar))
@@ -92,13 +90,11 @@ impl PerformCrud for EditSite {
       .updated(Some(Some(naive_now())))
       .build();
 
-    blocking(context.pool(), move |conn| {
-      Site::update(conn, local_site.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
-    .ok();
+    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
+      .ok();
 
     let local_site_form = LocalSiteUpdateForm::builder()
       .enable_downvotes(data.enable_downvotes)
@@ -123,14 +119,12 @@ impl PerformCrud for EditSite {
       .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.to_owned())
+      .captcha_difficulty(data.captcha_difficulty.clone())
       .build();
 
-    let update_local_site = blocking(context.pool(), move |conn| {
-      LocalSite::update(conn, &local_site_form)
-    })
-    .await
-    .ok();
+    let update_local_site = LocalSite::update(context.pool(), &local_site_form)
+      .await
+      .ok();
 
     let local_site_rate_limit_form = LocalSiteRateLimitUpdateForm::builder()
       .message(data.rate_limit_message)
@@ -147,23 +141,15 @@ impl PerformCrud for EditSite {
       .search_per_second(data.rate_limit_search_per_second)
       .build();
 
-    blocking(context.pool(), move |conn| {
-      LocalSiteRateLimit::update(conn, &local_site_rate_limit_form)
-    })
-    .await
-    .ok();
+    LocalSiteRateLimit::update(context.pool(), &local_site_rate_limit_form)
+      .await
+      .ok();
 
     // Replace the blocked and allowed instances
-    let allowed = data.allowed_instances.to_owned();
-    blocking(context.pool(), move |conn| {
-      FederationAllowList::replace(conn, allowed)
-    })
-    .await??;
-    let blocked = data.blocked_instances.to_owned();
-    blocking(context.pool(), move |conn| {
-      FederationBlockList::replace(conn, blocked)
-    })
-    .await??;
+    let allowed = data.allowed_instances.clone();
+    FederationAllowList::replace(context.pool(), allowed).await?;
+    let blocked = data.blocked_instances.clone();
+    FederationBlockList::replace(context.pool(), blocked).await?;
 
     // TODO can't think of a better way to do this.
     // If the server suddenly requires email verification, or required applications, no old users
@@ -172,39 +158,35 @@ impl PerformCrud for EditSite {
 
     let new_require_application = update_local_site
       .as_ref()
-      .map(|ols| {
-        ols
-          .as_ref()
-          .map(|ls| ls.require_application)
-          .unwrap_or(false)
-      })
+      .map(|ols| ols.require_application)
       .unwrap_or(false);
     if !local_site.require_application && new_require_application {
-      blocking(context.pool(), move |conn| {
-        LocalUser::set_all_users_registration_applications_accepted(conn)
-      })
-      .await?
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_registrations_accepted"))?;
+      LocalUser::set_all_users_registration_applications_accepted(context.pool())
+        .await
+        .map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_registrations_accepted"))?;
     }
 
     let new_require_email_verification = update_local_site
       .as_ref()
-      .map(|ols| {
-        ols
-          .as_ref()
-          .map(|ls| ls.require_email_verification)
-          .unwrap_or(false)
-      })
+      .map(|ols| ols.require_email_verification)
       .unwrap_or(false);
     if !local_site.require_email_verification && new_require_email_verification {
-      blocking(context.pool(), move |conn| {
-        LocalUser::set_all_users_email_verified(conn)
-      })
-      .await?
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_email_verified"))?;
+      LocalUser::set_all_users_email_verified(context.pool())
+        .await
+        .map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_email_verified"))?;
     }
 
-    let site_view = blocking(context.pool(), SiteView::read_local).await??;
+    let taglines = data.taglines.to_owned();
+    Tagline::replace(context.pool(), local_site.id, taglines).await?;
+
+    let site_view = SiteView::read_local(context.pool()).await?;
+
+    let rate_limit_config =
+      local_site_rate_limit_to_rate_limit_config(&site_view.local_site_rate_limit);
+    context
+      .settings_updated_channel()
+      .send(rate_limit_config)
+      .await?;
 
     let res = SiteResponse { site_view };