use crate::{
+ activities::verify_community_matches,
fetcher::post_or_comment::PostOrComment,
+ local_instance,
mentions::MentionOrValue,
- objects::{comment::ApubComment, person::ApubPerson, post::ApubPost},
- protocol::Source,
+ objects::{comment::ApubComment, community::ApubCommunity, person::ApubPerson, post::ApubPost},
+ protocol::{objects::LanguageTag, InCommunity, Source},
+};
+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::utils::blocking;
-use lemmy_apub_lib::{object_id::ObjectId, values::MediaTypeHtml};
-use lemmy_db_schema::{newtypes::CommentId, source::post::Post, traits::Crud};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_api_common::context::LemmyContext;
+use lemmy_db_schema::{
+ source::{community::Community, post::Post},
+ traits::Crud,
+};
+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 = "crate::deserialize_one_or_many")]
+ #[serde(deserialize_with = "deserialize_one_or_many")]
pub(crate) to: Vec<Url>,
- #[serde(default)]
- #[serde(deserialize_with = "crate::deserialize_one_or_many")]
+ #[serde(deserialize_with = "deserialize_one_or_many", default)]
pub(crate) cc: Vec<Url>,
pub(crate) content: String,
pub(crate) in_reply_to: ObjectId<PostOrComment>,
- pub(crate) media_type: Option<MediaTypeHtml>,
- #[serde(default)]
- #[serde(deserialize_with = "crate::deserialize_skip_error")]
+ 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(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, context.client(), 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())))
}
}
}
}
+
+#[async_trait::async_trait(?Send)]
+impl InCommunity for Note {
+ async fn community(
+ &self,
+ context: &LemmyContext,
+ request_counter: &mut i32,
+ ) -> 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())?;
+ }
+ Ok(community.into())
+ }
+}