use crate::{
check_apub_id_valid_with_strictness,
collections::{
+ community_featured::ApubCommunityFeatured,
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},
},
};
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_api_common::{context::LemmyContext, utils::local_site_opt_to_slur_regex};
use lemmy_db_schema::{
};
use lemmy_utils::{
error::LemmyError,
- utils::{check_slurs, check_slurs_opt},
+ utils::slurs::{check_slurs, check_slurs_opt},
};
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none;
+use std::fmt::Debug;
use url::Url;
#[skip_serializing_none]
pub(crate) image: Option<ImageObject>,
// lemmy extension
pub(crate) sensitive: Option<bool>,
- // deprecated, use attributed_to instead
- pub(crate) moderators: Option<ObjectId<ApubCommunityModerators>>,
#[serde(deserialize_with = "deserialize_skip_error", default)]
- pub(crate) attributed_to: Option<ObjectId<ApubCommunityModerators>>,
+ 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>>,
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)?;
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()),
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),
}
}
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())),
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),
}
}
}