use crate::{
- check_is_apub_id_valid,
+ check_apub_id_valid_with_strictness,
collections::{
community_moderators::ApubCommunityModerators,
community_outbox::ApubCommunityOutbox,
},
- objects::{community::ApubCommunity, get_summary_from_string_or_source},
- protocol::{objects::Endpoints, ImageObject, Source, Unparsed},
+ fetch_local_site_data,
+ objects::{community::ApubCommunity, read_from_string_or_source_opt},
+ protocol::{
+ objects::{Endpoints, LanguageTag},
+ ImageObject,
+ Source,
+ },
+};
+use activitypub_federation::{
+ core::{object_id::ObjectId, signatures::PublicKey},
+ deser::helpers::deserialize_skip_error,
+ utils::verify_domains_match,
};
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::{naive_now, source::community::CommunityForm};
+use lemmy_api_common::utils::{blocking, local_site_opt_to_slur_regex};
+use lemmy_db_schema::{
+ newtypes::InstanceId,
+ source::community::{CommunityInsertForm, CommunityUpdateForm},
+ utils::naive_now,
+};
use lemmy_utils::{
+ error::LemmyError,
utils::{check_slurs, check_slurs_opt},
- LemmyError,
};
use lemmy_websocket::LemmyContext;
use serde::{Deserialize, Serialize};
#[serde(rename = "type")]
pub(crate) kind: GroupType,
pub(crate) id: ObjectId<ApubCommunity>,
- /// username, set at account creation and can never be changed
+ /// username, set at account creation and usually fixed after that
pub(crate) preferred_username: String,
- /// title (can be changed at any time)
- pub(crate) name: String,
+ pub(crate) inbox: Url,
+ pub(crate) followers: Url,
+ pub(crate) public_key: PublicKey,
+
+ /// title
+ pub(crate) name: Option<String>,
pub(crate) summary: Option<String>,
+ #[serde(deserialize_with = "deserialize_skip_error", default)]
pub(crate) source: Option<Source>,
pub(crate) icon: Option<ImageObject>,
/// banner
pub(crate) sensitive: Option<bool>,
// lemmy extension
pub(crate) moderators: Option<ObjectId<ApubCommunityModerators>>,
- pub(crate) inbox: Url,
+ // lemmy extension
+ pub(crate) posting_restricted_to_mods: Option<bool>,
pub(crate) outbox: ObjectId<ApubCommunityOutbox>,
- pub(crate) followers: Url,
- pub(crate) endpoints: Endpoints,
- pub(crate) public_key: PublicKey,
+ pub(crate) endpoints: Option<Endpoints>,
+ #[serde(default)]
+ pub(crate) language: Vec<LanguageTag>,
pub(crate) published: Option<DateTime<FixedOffset>>,
pub(crate) updated: Option<DateTime<FixedOffset>>,
- #[serde(flatten)]
- pub(crate) unparsed: Unparsed,
}
impl Group {
expected_domain: &Url,
context: &LemmyContext,
) -> Result<(), LemmyError> {
- check_is_apub_id_valid(self.id.inner(), true, &context.settings())?;
+ let local_site_data = blocking(context.pool(), fetch_local_site_data).await??;
+
+ check_apub_id_valid_with_strictness(
+ self.id.inner(),
+ true,
+ &local_site_data,
+ context.settings(),
+ )?;
verify_domains_match(expected_domain, self.id.inner())?;
- let slur_regex = &context.settings().slur_regex();
+ let slur_regex = &local_site_opt_to_slur_regex(&local_site_data.local_site);
+
check_slurs(&self.preferred_username, slur_regex)?;
- check_slurs(&self.name, slur_regex)?;
- let description = get_summary_from_string_or_source(&self.summary, &self.source);
+ check_slurs_opt(&self.name, slur_regex)?;
+ 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,
- title: self.name,
- description: get_summary_from_string_or_source(&self.summary, &self.source),
+ pub(crate) fn into_insert_form(self, instance_id: InstanceId) -> CommunityInsertForm {
+ 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),
removed: None,
published: self.published.map(|u| u.naive_local()),
updated: self.updated.map(|u| u.naive_local()),
actor_id: Some(self.id.into()),
local: Some(false),
private_key: None,
+ hidden: Some(false),
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()),
+ posting_restricted_to_mods: self.posting_restricted_to_mods,
+ instance_id,
+ }
+ }
+
+ 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: Some(false),
+ private_key: None,
+ hidden: Some(false),
+ 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.shared_inbox.map(|s| s.into())),
+ shared_inbox_url: Some(self.endpoints.map(|e| e.shared_inbox.into())),
+ posting_restricted_to_mods: self.posting_restricted_to_mods,
}
}
}
projects / lemmy.git / blobdiff