X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fprotocol%2Fobjects%2Fgroup.rs;h=9c679fdf10a6bd6b5f87281e1e616fe67305dd05;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=2b32915afa62be879fe077875b1a6513d396caa5;hpb=becf75d1f9df5b6c57c6f7369a53681b2d33929d;p=lemmy.git diff --git a/crates/apub/src/protocol/objects/group.rs b/crates/apub/src/protocol/objects/group.rs index 2b32915a..9c679fdf 100644 --- a/crates/apub/src/protocol/objects/group.rs +++ b/crates/apub/src/protocol/objects/group.rs @@ -5,7 +5,7 @@ use crate::{ community_moderators::ApubCommunityModerators, community_outbox::ApubCommunityOutbox, }, - fetch_local_site_data, + local_site_data_cached, objects::{community::ApubCommunity, read_from_string_or_source_opt}, protocol::{ objects::{Endpoints, LanguageTag}, @@ -23,7 +23,10 @@ use activitypub_federation::{ }, }; use chrono::{DateTime, FixedOffset}; -use lemmy_api_common::{context::LemmyContext, utils::local_site_opt_to_slur_regex}; +use lemmy_api_common::{ + context::LemmyContext, + utils::{local_site_opt_to_slur_regex, sanitize_html, sanitize_html_opt}, +}; use lemmy_db_schema::{ newtypes::InstanceId, source::community::{CommunityInsertForm, CommunityUpdateForm}, @@ -80,16 +83,10 @@ impl Group { expected_domain: &Url, context: &LemmyContext, ) -> Result<(), LemmyError> { - let local_site_data = fetch_local_site_data(context.pool()).await?; - - check_apub_id_valid_with_strictness( - self.id.inner(), - true, - &local_site_data, - context.settings(), - )?; + check_apub_id_valid_with_strictness(self.id.inner(), true, context).await?; verify_domains_match(expected_domain, self.id.inner())?; + let local_site_data = local_site_data_cached(&mut context.pool()).await?; let slur_regex = &local_site_opt_to_slur_regex(&local_site_data.local_site); check_slurs(&self.preferred_username, slur_regex)?; @@ -100,10 +97,15 @@ impl Group { } pub(crate) fn into_insert_form(self, instance_id: InstanceId) -> CommunityInsertForm { + let name = sanitize_html(&self.preferred_username); + let title = sanitize_html(&self.name.unwrap_or(self.preferred_username)); + let description = read_from_string_or_source_opt(&self.summary, &None, &self.source); + let description = sanitize_html_opt(&description); + CommunityInsertForm { - name: self.preferred_username.clone(), - title: self.name.unwrap_or(self.preferred_username), - description: read_from_string_or_source_opt(&self.summary, &None, &self.source), + name, + title, + description, removed: None, published: self.published.map(|u| u.naive_local()), updated: self.updated.map(|u| u.naive_local()),