use crate::{
- check_is_apub_id_valid,
+ check_apub_id_valid_with_strictness,
collections::{
+ community_featured::ApubCommunityFeatured,
community_moderators::ApubCommunityModerators,
community_outbox::ApubCommunityOutbox,
},
- objects::{
- community::ApubCommunity,
- read_from_string_or_source_opt,
- verify_image_domain_matches,
+ local_site_data_cached,
+ objects::{community::ApubCommunity, read_from_string_or_source_opt},
+ protocol::{
+ objects::{Endpoints, LanguageTag},
+ ImageObject,
+ Source,
+ },
+};
+use activitypub_federation::{
+ fetch::{collection_id::CollectionId, object_id::ObjectId},
+ kinds::actor::GroupType,
+ protocol::{
+ helpers::deserialize_skip_error,
+ public_key::PublicKey,
+ verification::verify_domains_match,
},
- protocol::{objects::Endpoints, ImageObject, Source},
};
-use activitystreams_kinds::actor::GroupType;
use chrono::{DateTime, FixedOffset};
-use lemmy_apub_lib::{object_id::ObjectId, signatures::PublicKey, verify::verify_domains_match};
-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::{
- utils::{check_slurs, check_slurs_opt},
- LemmyError,
+ error::LemmyError,
+ 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]
/// title
pub(crate) name: Option<String>,
pub(crate) summary: Option<String>,
- #[serde(default)]
- #[serde(deserialize_with = "crate::deserialize_skip_error")]
+ #[serde(deserialize_with = "deserialize_skip_error", default)]
pub(crate) source: Option<Source>,
pub(crate) icon: Option<ImageObject>,
/// banner
pub(crate) image: Option<ImageObject>,
// lemmy extension
pub(crate) sensitive: Option<bool>,
- // lemmy extension
- pub(crate)
moderators: Option<ObjectId<ApubCommunityModerators>>,
+ #[serde(deserialize_with = "deserialize_skip_error", default)]
+ pub(crate)
attributed_to: Option<CollectionId<ApubCommunityModerators>>,
// lemmy extension
pub(crate) posting_restricted_to_mods: Option<bool>,
- pub(crate) outbox:
ObjectId<ApubCommunityOutbox>,
+ pub(crate) outbox:
CollectionId<ApubCommunityOutbox>,
pub(crate) endpoints: Option<Endpoints>,
+ pub(crate) featured: Option<CollectionId<ApubCommunityFeatured>>,
+ #[serde(default)]
+ pub(crate) language: Vec<LanguageTag>,
pub(crate) published: Option<DateTime<FixedOffset>>,
pub(crate) updated: Option<DateTime<FixedOffset>>,
}
expected_domain: &Url,
context: &LemmyContext,
) -> Result<(), LemmyError> {
- check_is_apub_id_valid(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())?;
- verify_image_domain_matches(expected_domain, &self.icon)?;
- verify_image_domain_matches(expected_domain, &self.image)?;
- 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, &self.source);
+ let description = read_from_string_or_source_opt(&self.summary, &None, &self.source);
check_slurs_opt(&description, slur_regex)?;
Ok(())
}
- pub(crate) fn into_form(self) -> CommunityForm {
- CommunityForm {
- name: self.preferred_username.clone(),
- title: self.name.unwrap_or(self.preferred_username),
- description: read_from_string_or_source_opt(&self.summary, &self.source),
+ 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: None,
+ deleted: Some(false),
nsfw: Some(self.sensitive.unwrap_or(false)),
actor_id: Some(self.id.into()),
local: Some(false),
private_key: None,
- hidden: Some(false),
+ 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,
+ &self.source,
+ )),
+ removed: None,
+ published: self.published.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: None,
+ private_key: None,
+ 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())),
banner: Some(self.image.map(|i| i.url.into())),
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),
}
}
}
projects / lemmy.git / blobdiff