use crate::{
- activities::{verify_is_public, verify_person_in_community},
+ activities::verify_community_matches,
fetcher::post_or_comment::PostOrComment,
+ local_instance,
+ mentions::MentionOrValue,
objects::{comment::ApubComment, community::ApubCommunity, person::ApubPerson, post::ApubPost},
- protocol::Source,
+ protocol::{objects::LanguageTag, InCommunity, Source},
};
-use activitystreams::{object::kind::NoteType, unparsed::Unparsed};
-use anyhow::anyhow;
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ deser::{
+ helpers::{deserialize_one_or_many, deserialize_skip_error},
+ values::MediaTypeMarkdownOrHtml,
+ },
+};
+use activitystreams_kinds::object::NoteType;
use chrono::{DateTime, FixedOffset};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{object_id::ObjectId, values::MediaTypeHtml, verify::verify_domains_match};
+use lemmy_api_common::context::LemmyContext;
use lemmy_db_schema::{
- newtypes::CommentId,
source::{community::Community, post::Post},
traits::Crud,
};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::LemmyError;
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none;
use std::ops::Deref;
pub(crate) r#type: NoteType,
pub(crate) id: ObjectId<ApubComment>,
pub(crate) attributed_to: ObjectId<ApubPerson>,
+ #[serde(deserialize_with = "deserialize_one_or_many")]
pub(crate) to: Vec<Url>,
+ #[serde(deserialize_with = "deserialize_one_or_many", default)]
+ pub(crate) cc: Vec<Url>,
pub(crate) content: String,
- pub(crate) media_type: Option<MediaTypeHtml>,
- pub(crate) source: SourceCompat,
pub(crate) in_reply_to: ObjectId<PostOrComment>,
+
+ pub(crate) media_type: Option<MediaTypeMarkdownOrHtml>,
+ #[serde(deserialize_with = "deserialize_skip_error", default)]
+ pub(crate) source: Option<Source>,
pub(crate) published: Option<DateTime<FixedOffset>>,
pub(crate) updated: Option<DateTime<FixedOffset>>,
- #[serde(flatten)]
- pub(crate) unparsed: Unparsed,
-}
-
-/// Pleroma puts a raw string in the source, so we have to handle it here for deserialization to work
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-#[serde(untagged)]
-pub(crate) enum SourceCompat {
- Lemmy(Source),
- Pleroma(String),
+ #[serde(default)]
+ pub(crate) tag: Vec<MentionOrValue>,
+ // lemmy extension
+ pub(crate) distinguished: Option<bool>,
+ pub(crate) language: Option<LanguageTag>,
+ pub(crate) audience: Option<ObjectId<ApubCommunity>>,
}
impl Note {
&self,
context: &LemmyContext,
request_counter: &mut i32,
- ) -> Result<(ApubPost, Option<CommentId>), LemmyError> {
+ ) -> Result<(ApubPost, Option<ApubComment>), LemmyError> {
// Fetch parent comment chain in a box, otherwise it can cause a stack overflow.
let parent = Box::pin(
self
.in_reply_to
- .dereference(context, request_counter)
+ .dereference(context, local_instance(context).await, request_counter)
.await?,
);
match parent.deref() {
- PostOrComment::Post(p) => {
- // Workaround because I cant figure out how to get the post out of the box (and we dont
- // want to stackoverflow in a deep comment hierarchy).
- let post_id = p.id;
- let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
- Ok((post.into(), None))
- }
+ PostOrComment::Post(p) => Ok((p.clone(), None)),
PostOrComment::Comment(c) => {
let post_id = c.post_id;
- let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
- Ok((post.into(), Some(c.id)))
+ let post = Post::read(context.pool(), post_id).await?;
+ Ok((post.into(), Some(c.clone())))
}
}
}
+}
- pub(crate) async fn verify(
+#[async_trait::async_trait(?Send)]
+impl InCommunity for Note {
+ async fn community(
&self,
context: &LemmyContext,
request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- let (post, _parent_comment_id) = self.get_parents(context, request_counter).await?;
- let community_id = post.community_id;
- let community: ApubCommunity = blocking(context.pool(), move |conn| {
- Community::read(conn, community_id)
- })
- .await??
- .into();
-
- if post.locked {
- return Err(anyhow!("Post is locked").into());
+ ) -> Result<ApubCommunity, LemmyError> {
+ let (post, _) = self.get_parents(context, request_counter).await?;
+ let community = Community::read(context.pool(), post.community_id).await?;
+ if let Some(audience) = &self.audience {
+ verify_community_matches(audience, community.actor_id.clone())?;
}
- verify_domains_match(self.attributed_to.inner(), self.id.inner())?;
- verify_person_in_community(&self.attributed_to, &community, context, request_counter).await?;
- verify_is_public(&self.to)?;
- Ok(())
+ Ok(community.into())
}
}