diff --git a/crates/api_common/src/tagline.rs b/crates/api_common/src/tagline.rs index 40456277d..14f2be768 100644 --- a/crates/api_common/src/tagline.rs +++ b/crates/api_common/src/tagline.rs @@ -9,7 +9,7 @@ use ts_rs::TS; #[cfg_attr(feature = "full", ts(export))] /// Create a tagline pub struct CreateTagline { - pub content: String, + pub content: Option, } #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)] diff --git a/crates/api_crud/src/tagline/create.rs b/crates/api_crud/src/tagline/create.rs index 29821d321..85e0281a1 100644 --- a/crates/api_crud/src/tagline/create.rs +++ b/crates/api_crud/src/tagline/create.rs @@ -3,7 +3,7 @@ use actix_web::web::Json; use lemmy_api_common::{ context::LemmyContext, tagline::{CreateTagline, TaglineResponse}, - utils::is_admin, + utils::{get_url_blocklist, is_admin, local_site_to_slur_regex, process_markdown_opt}, }; use lemmy_db_schema::{ source::{ @@ -13,7 +13,7 @@ use lemmy_db_schema::{ traits::Crud, }; use lemmy_db_views::structs::LocalUserView; -use lemmy_utils::error::LemmyError; +use lemmy_utils::{error::LemmyError, utils::validation::is_valid_body_field}; #[tracing::instrument(skip(context))] pub async fn create_tagline( @@ -21,13 +21,19 @@ pub async fn create_tagline( context: Data, local_user_view: LocalUserView, ) -> Result, LemmyError> { - let local_site = LocalSite::read(&mut context.pool()).await?; // Make sure user is an admin is_admin(&local_user_view)?; + let local_site = LocalSite::read(&mut context.pool()).await?; + + let slur_regex = local_site_to_slur_regex(&local_site); + let url_blocklist = get_url_blocklist(&context).await?; + let content = process_markdown_opt(&data.content, &slur_regex, &url_blocklist, &context).await?; + is_valid_body_field(&content, false)?; + let tagline_form = TaglineInsertForm { local_site_id: local_site.id, - content: data.content.to_string(), + content, }; let tagline = Tagline::create(&mut context.pool(), &tagline_form).await?; diff --git a/crates/db_schema/src/source/tagline.rs b/crates/db_schema/src/source/tagline.rs index 62dcf5a34..ba026ca70 100644 --- a/crates/db_schema/src/source/tagline.rs +++ b/crates/db_schema/src/source/tagline.rs @@ -34,7 +34,7 @@ pub struct Tagline { #[cfg_attr(feature = "full", diesel(table_name = tagline))] pub struct TaglineInsertForm { pub local_site_id: LocalSiteId, - pub content: String, + pub content: Option, } #[derive(Clone, Default)]