X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fprotocol%2Fobjects%2Fgroup.rs;h=9c679fdf10a6bd6b5f87281e1e616fe67305dd05;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=d5ebe789eded13db7c69b415c73b63466bf0cafb;hpb=8bfeb4b627c1f96c88ea0e2d4b32488e1ce717fc;p=lemmy.git diff --git a/crates/apub/src/protocol/objects/group.rs b/crates/apub/src/protocol/objects/group.rs index d5ebe789..9c679fdf 100644 --- a/crates/apub/src/protocol/objects/group.rs +++ b/crates/apub/src/protocol/objects/group.rs @@ -1,27 +1,44 @@ use crate::{ check_apub_id_valid_with_strictness, collections::{ + community_featured::ApubCommunityFeatured, community_moderators::ApubCommunityModerators, community_outbox::ApubCommunityOutbox, }, + local_site_data_cached, objects::{community::ApubCommunity, read_from_string_or_source_opt}, - protocol::{objects::Endpoints, ImageObject, Source}, + protocol::{ + objects::{Endpoints, LanguageTag}, + ImageObject, + Source, + }, }; use activitypub_federation::{ - core::{object_id::ObjectId, signatures::PublicKey}, - deser::helpers::deserialize_skip_error, - utils::verify_domains_match, + fetch::{collection_id::CollectionId, object_id::ObjectId}, + kinds::actor::GroupType, + protocol::{ + helpers::deserialize_skip_error, + public_key::PublicKey, + verification::verify_domains_match, + }, }; -use activitystreams_kinds::actor::GroupType; use chrono::{DateTime, FixedOffset}; -use lemmy_db_schema::{source::community::CommunityForm, utils::naive_now}; +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}, + utils::naive_now, +}; use lemmy_utils::{ error::LemmyError, - utils::{check_slurs, check_slurs_opt}, + utils::slurs::{check_slurs, check_slurs_opt}, }; -use lemmy_websocket::LemmyContext; use serde::{Deserialize, Serialize}; use serde_with::skip_serializing_none; +use std::fmt::Debug; use url::Url; #[skip_serializing_none] @@ -47,12 +64,15 @@ pub struct Group { pub(crate) image: Option, // lemmy extension pub(crate) sensitive: Option, - // lemmy extension - pub(crate) moderators: Option>, + #[serde(deserialize_with = "deserialize_skip_error", default)] + pub(crate) attributed_to: Option>, // lemmy extension pub(crate) posting_restricted_to_mods: Option, - pub(crate) outbox: ObjectId, + pub(crate) outbox: CollectionId, pub(crate) endpoints: Option, + pub(crate) featured: Option>, + #[serde(default)] + pub(crate) language: Vec, pub(crate) published: Option>, pub(crate) updated: Option>, } @@ -63,10 +83,12 @@ impl Group { expected_domain: &Url, context: &LemmyContext, ) -> Result<(), LemmyError> { - check_apub_id_valid_with_strictness(self.id.inner(), true, context.settings())?; + check_apub_id_valid_with_strictness(self.id.inner(), true, context).await?; verify_domains_match(expected_domain, self.id.inner())?; - let slur_regex = &context.settings().slur_regex(); + 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)?; check_slurs_opt(&self.name, slur_regex)?; let description = read_from_string_or_source_opt(&self.summary, &None, &self.source); @@ -74,10 +96,42 @@ impl Group { Ok(()) } - pub(crate) fn into_form(self) -> CommunityForm { - CommunityForm { - name: self.preferred_username.clone(), - title: self.name.unwrap_or(self.preferred_username), + 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, + title, + description, + removed: None, + published: self.published.map(|u| u.naive_local()), + updated: self.updated.map(|u| u.naive_local()), + deleted: Some(false), + nsfw: Some(self.sensitive.unwrap_or(false)), + actor_id: Some(self.id.into()), + local: Some(false), + private_key: None, + hidden: None, + public_key: self.public_key.public_key_pem, + last_refreshed_at: Some(naive_now()), + icon: self.icon.map(|i| i.url.into()), + banner: self.image.map(|i| i.url.into()), + followers_url: Some(self.followers.into()), + inbox_url: Some(self.inbox.into()), + shared_inbox_url: self.endpoints.map(|e| e.shared_inbox.into()), + moderators_url: self.attributed_to.map(Into::into), + posting_restricted_to_mods: self.posting_restricted_to_mods, + instance_id, + featured_url: self.featured.map(Into::into), + } + } + + pub(crate) fn into_update_form(self) -> CommunityUpdateForm { + CommunityUpdateForm { + title: Some(self.name.unwrap_or(self.preferred_username)), description: Some(read_from_string_or_source_opt( &self.summary, &None, @@ -85,13 +139,13 @@ impl Group { )), removed: None, published: self.published.map(|u| u.naive_local()), - updated: self.updated.map(|u| u.naive_local()), + updated: Some(self.updated.map(|u| u.naive_local())), deleted: None, nsfw: Some(self.sensitive.unwrap_or(false)), actor_id: Some(self.id.into()), - local: Some(false), + local: None, private_key: None, - hidden: Some(false), + hidden: None, public_key: Some(self.public_key.public_key_pem), last_refreshed_at: Some(naive_now()), icon: Some(self.icon.map(|i| i.url.into())), @@ -99,7 +153,9 @@ impl Group { followers_url: Some(self.followers.into()), inbox_url: Some(self.inbox.into()), shared_inbox_url: Some(self.endpoints.map(|e| e.shared_inbox.into())), + moderators_url: self.attributed_to.map(Into::into), posting_restricted_to_mods: self.posting_restricted_to_mods, + featured_url: self.featured.map(Into::into), } } }