use crate::{
activities::{verify_is_public, verify_person_in_community},
- fetcher::object_id::ObjectId,
- objects::{
- community::ApubCommunity,
- person::ApubPerson,
- tombstone::Tombstone,
+ check_apub_id_valid_with_strictness,
+ local_instance,
+ objects::{read_from_string_or_source_opt, verify_is_remote_object},
+ protocol::{
+ objects::{
+ page::{Attachment, AttributedTo, Page, PageType},
+ LanguageTag,
+ },
ImageObject,
Source,
},
};
-use activitystreams::{
- object::kind::{ImageType, PageType},
- public,
- unparsed::Unparsed,
-};
-use anyhow::anyhow;
-use chrono::{DateTime, FixedOffset, NaiveDateTime};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ deser::values::MediaTypeMarkdownOrHtml,
traits::ApubObject,
- values::{MediaTypeHtml, MediaTypeMarkdown},
- verify::verify_domains_match,
+ utils::verify_domains_match,
};
+use activitystreams_kinds::public;
+use chrono::NaiveDateTime;
+use lemmy_api_common::{request::fetch_site_data, utils::blocking};
use lemmy_db_schema::{
self,
source::{
community::Community,
+ moderator::{ModLockPost, ModLockPostForm, ModStickyPost, ModStickyPostForm},
person::Person,
post::{Post, PostForm},
},
traits::Crud,
};
use lemmy_utils::{
- request::fetch_site_data,
+ error::LemmyError,
utils::{check_slurs, convert_datetime, markdown_to_html, remove_slurs},
- LemmyError,
};
use lemmy_websocket::LemmyContext;
-use serde::{Deserialize, Serialize};
-use serde_with::skip_serializing_none;
use std::ops::Deref;
use url::Url;
-#[skip_serializing_none]
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Page {
- r#type: PageType,
- id: Url,
- pub(crate) attributed_to: ObjectId<ApubPerson>,
- to: Vec<Url>,
- name: String,
- content: Option<String>,
- media_type: Option<MediaTypeHtml>,
- source: Option<Source>,
- url: Option<Url>,
- image: Option<ImageObject>,
- pub(crate) comments_enabled: Option<bool>,
- sensitive: Option<bool>,
- pub(crate) stickied: Option<bool>,
- published: Option<DateTime<FixedOffset>>,
- updated: Option<DateTime<FixedOffset>>,
- #[serde(flatten)]
- unparsed: Unparsed,
-}
-
-impl Page {
- pub(crate) fn id_unchecked(&self) -> &Url {
- &self.id
- }
- pub(crate) fn id(&self, expected_domain: &Url) -> Result<&Url, LemmyError> {
- verify_domains_match(&self.id, expected_domain)?;
- Ok(&self.id)
- }
-
- /// Only mods can change the post's stickied/locked status. So if either of these is changed from
- /// the current value, it is a mod action and needs to be verified as such.
- ///
- /// Both stickied and locked need to be false on a newly created post (verified in [[CreatePost]].
- pub(crate) async fn is_mod_action(&self, context: &LemmyContext) -> Result<bool, LemmyError> {
- let old_post = ObjectId::<ApubPost>::new(self.id.clone())
- .dereference_local(context)
- .await;
-
- let is_mod_action = if let Ok(old_post) = old_post {
- self.stickied != Some(old_post.stickied) || self.comments_enabled != Some(!old_post.locked)
- } else {
- false
- };
- Ok(is_mod_action)
- }
-
- pub(crate) async fn verify(
- &self,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- let community = self.extract_community(context, request_counter).await?;
-
- check_slurs(&self.name, &context.settings().slur_regex())?;
- verify_domains_match(self.attributed_to.inner(), &self.id.clone())?;
- verify_person_in_community(&self.attributed_to, &community, context, request_counter).await?;
- verify_is_public(&self.to.clone())?;
- Ok(())
- }
-
- pub(crate) async fn extract_community(
- &self,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<ApubCommunity, LemmyError> {
- let mut to_iter = self.to.iter();
- loop {
- if let Some(cid) = to_iter.next() {
- let cid = ObjectId::new(cid.clone());
- if let Ok(c) = cid.dereference(context, request_counter).await {
- break Ok(c);
- }
- } else {
- return Err(anyhow!("No community found in cc").into());
- }
- }
- }
-}
-
#[derive(Clone, Debug)]
pub struct ApubPost(Post);
impl From<Post> for ApubPost {
fn from(p: Post) -> Self {
- ApubPost { 0: p }
+ ApubPost(p)
}
}
impl ApubObject for ApubPost {
type DataType = LemmyContext;
type ApubType = Page;
- type TombstoneType = Tombstone;
+ type DbType = Post;
+ type Error = LemmyError;
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
None
}
+ #[tracing::instrument(skip_all)]
async fn read_from_apub_id(
object_id: Url,
context: &LemmyContext,
)
}
+ #[tracing::instrument(skip_all)]
async fn delete(self, context: &LemmyContext) -> Result<(), LemmyError> {
- blocking(context.pool(), move |conn| {
- Post::update_deleted(conn, self.id, true)
- })
- .await??;
+ if !self.deleted {
+ blocking(context.pool(), move |conn| {
+ Post::update_deleted(conn, self.id, true)
+ })
+ .await??;
+ }
Ok(())
}
// Turn a Lemmy post into an ActivityPub page that can be sent out over the network.
- async fn to_apub(&self, context: &LemmyContext) -> Result<Page, LemmyError> {
+ #[tracing::instrument(skip_all)]
+ async fn into_apub(self, context: &LemmyContext) -> Result<Page, LemmyError> {
let creator_id = self.creator_id;
let creator = blocking(context.pool(), move |conn| Person::read(conn, creator_id)).await??;
let community_id = self.community_id;
Community::read(conn, community_id)
})
.await??;
-
- let source = self.body.clone().map(|body| Source {
- content: body,
- media_type: MediaTypeMarkdown::Markdown,
- });
- let image = self.thumbnail_url.clone().map(|thumb| ImageObject {
- kind: ImageType::Image,
- url: thumb.into(),
- });
+ let language = LanguageTag::new_single(self.language_id, context.pool()).await?;
let page = Page {
- r#type: PageType::Page,
- id: self.ap_id.clone().into(),
- attributed_to: ObjectId::new(creator.actor_id),
+ kind: PageType::Page,
+ id: ObjectId::new(self.ap_id.clone()),
+ attributed_to: AttributedTo::Lemmy(ObjectId::new(creator.actor_id)),
to: vec![community.actor_id.into(), public()],
+ cc: vec![],
name: self.name.clone(),
content: self.body.as_ref().map(|b| markdown_to_html(b)),
- media_type: Some(MediaTypeHtml::Html),
- source,
+ media_type: Some(MediaTypeMarkdownOrHtml::Html),
+ source: self.body.clone().map(Source::new),
url: self.url.clone().map(|u| u.into()),
- image,
+ attachment: self.url.clone().map(Attachment::new).into_iter().collect(),
+ image: self.thumbnail_url.clone().map(ImageObject::new),
comments_enabled: Some(!self.locked),
sensitive: Some(self.nsfw),
stickied: Some(self.stickied),
+ language,
published: Some(convert_datetime(self.published)),
updated: self.updated.map(convert_datetime),
- unparsed: Default::default(),
};
Ok(page)
}
- fn to_tombstone(&self) -> Result<Tombstone, LemmyError> {
- Ok(Tombstone::new(
- PageType::Page,
- self.updated.unwrap_or(self.published),
- ))
- }
-
- async fn from_apub(
+ #[tracing::instrument(skip_all)]
+ async fn verify(
page: &Page,
- context: &LemmyContext,
expected_domain: &Url,
+ context: &LemmyContext,
request_counter: &mut i32,
- ) -> Result<ApubPost, LemmyError> {
+ ) -> Result<(), LemmyError> {
// We can't verify the domain in case of mod action, because the mod may be on a different
// instance from the post author.
- let ap_id = if page.is_mod_action(context).await? {
- page.id_unchecked()
- } else {
- page.id(expected_domain)?
+ if !page.is_mod_action(context).await? {
+ verify_domains_match(page.id.inner(), expected_domain)?;
+ verify_is_remote_object(page.id.inner(), context.settings())?;
};
- let ap_id = Some(ap_id.clone().into());
+
+ let community = page.extract_community(context, request_counter).await?;
+ check_apub_id_valid_with_strictness(page.id.inner(), community.local, context.settings())?;
+ verify_person_in_community(&page.creator()?, &community, context, request_counter).await?;
+ check_slurs(&page.name, &context.settings().slur_regex())?;
+ verify_domains_match(page.creator()?.inner(), page.id.inner())?;
+ verify_is_public(&page.to, &page.cc)?;
+ Ok(())
+ }
+
+ #[tracing::instrument(skip_all)]
+ async fn from_apub(
+ page: Page,
+ context: &LemmyContext,
+ request_counter: &mut i32,
+ ) -> Result<ApubPost, LemmyError> {
let creator = page
- .attributed_to
- .dereference(context, request_counter)
+ .creator()?
+ .dereference(context, local_instance(context), request_counter)
.await?;
let community = page.extract_community(context, request_counter).await?;
- verify_person_in_community(&page.attributed_to, &community, context, request_counter).await?;
- let thumbnail_url: Option<Url> = page.image.clone().map(|i| i.url);
- let (metadata_res, pictrs_thumbnail) = if let Some(url) = &page.url {
- fetch_site_data(context.client(), &context.settings(), Some(url)).await
+ let form = if !page.is_mod_action(context).await? {
+ let url = if let Some(attachment) = page.attachment.first() {
+ Some(match attachment {
+ // url as sent by Lemmy (new)
+ Attachment::Link(link) => link.href.clone(),
+ Attachment::Image(image) => image.url.clone(),
+ })
+ } else if page.kind == PageType::Video {
+ // we cant display videos directly, so insert a link to external video page
+ Some(page.id.inner().clone())
+ } else {
+ // url sent by lemmy (old)
+ page.url
+ };
+ let (metadata_res, thumbnail_url) = if let Some(url) = &url {
+ fetch_site_data(context.client(), context.settings(), Some(url)).await
+ } else {
+ (None, page.image.map(|i| i.url.into()))
+ };
+ let (embed_title, embed_description, embed_video_url) = metadata_res
+ .map(|u| (Some(u.title), Some(u.description), Some(u.embed_video_url)))
+ .unwrap_or_default();
+ let body_slurs_removed =
+ read_from_string_or_source_opt(&page.content, &page.media_type, &page.source)
+ .map(|s| Some(remove_slurs(&s, &context.settings().slur_regex())));
+ let language_id = LanguageTag::to_language_id_single(page.language, context.pool()).await?;
+
+ PostForm {
+ name: page.name.clone(),
+ url: Some(url.map(Into::into)),
+ body: body_slurs_removed,
+ creator_id: creator.id,
+ community_id: community.id,
+ removed: None,
+ locked: page.comments_enabled.map(|e| !e),
+ published: page.published.map(|u| u.naive_local()),
+ updated: page.updated.map(|u| u.naive_local()),
+ deleted: None,
+ nsfw: page.sensitive,
+ stickied: page.stickied,
+ embed_title,
+ embed_description,
+ embed_video_url,
+ thumbnail_url: Some(thumbnail_url),
+ ap_id: Some(page.id.clone().into()),
+ local: Some(false),
+ language_id,
+ }
} else {
- (None, thumbnail_url)
+ // if is mod action, only update locked/stickied fields, nothing else
+ PostForm {
+ name: page.name.clone(),
+ creator_id: creator.id,
+ community_id: community.id,
+ locked: page.comments_enabled.map(|e| !e),
+ stickied: page.stickied,
+ updated: page.updated.map(|u| u.naive_local()),
+ ap_id: Some(page.id.clone().into()),
+ ..Default::default()
+ }
};
- let (embed_title, embed_description, embed_html) = metadata_res
- .map(|u| (u.title, u.description, u.html))
- .unwrap_or((None, None, None));
- let body_slurs_removed = page
- .source
- .as_ref()
- .map(|s| remove_slurs(&s.content, &context.settings().slur_regex()));
- let form = PostForm {
- name: page.name.clone(),
- url: page.url.clone().map(|u| u.into()),
- body: body_slurs_removed,
- creator_id: creator.id,
- community_id: community.id,
- removed: None,
- locked: page.comments_enabled.map(|e| !e),
- published: page.published.map(|u| u.naive_local()),
- updated: page.updated.map(|u| u.naive_local()),
- deleted: None,
- nsfw: page.sensitive,
- stickied: page.stickied,
- embed_title,
- embed_description,
- embed_html,
- thumbnail_url: pictrs_thumbnail.map(|u| u.into()),
- ap_id,
- local: Some(false),
- };
+ // read existing, local post if any (for generating mod log)
+ let old_post = ObjectId::<ApubPost>::new(page.id.clone())
+ .dereference_local(context)
+ .await;
+
let post = blocking(context.pool(), move |conn| Post::upsert(conn, &form)).await??;
+
+ // write mod log entries for sticky/lock
+ if Page::is_stickied_changed(&old_post, &page.stickied) {
+ let form = ModStickyPostForm {
+ mod_person_id: creator.id,
+ post_id: post.id,
+ stickied: Some(post.stickied),
+ };
+ blocking(context.pool(), move |conn| {
+ ModStickyPost::create(conn, &form)
+ })
+ .await??;
+ }
+ if Page::is_locked_changed(&old_post, &page.comments_enabled) {
+ let form = ModLockPostForm {
+ mod_person_id: creator.id,
+ post_id: post.id,
+ locked: Some(post.locked),
+ };
+ blocking(context.pool(), move |conn| ModLockPost::create(conn, &form)).await??;
+ }
+
Ok(post.into())
}
}
#[cfg(test)]
mod tests {
use super::*;
- use crate::objects::{
- community::ApubCommunity,
- tests::{file_to_json_object, init_context},
+ use crate::{
+ objects::{
+ community::tests::parse_lemmy_community,
+ person::tests::parse_lemmy_person,
+ post::ApubPost,
+ tests::init_context,
+ },
+ protocol::tests::file_to_json_object,
};
- use assert_json_diff::assert_json_include;
+ use lemmy_db_schema::source::site::Site;
use serial_test::serial;
#[actix_rt::test]
#[serial]
async fn test_parse_lemmy_post() {
let context = init_context();
+ let conn = &mut context.pool().get().unwrap();
+ let (person, site) = parse_lemmy_person(&context).await;
+ let community = parse_lemmy_community(&context).await;
+
+ let json = file_to_json_object("assets/lemmy/objects/page.json").unwrap();
let url = Url::parse("https://enterprise.lemmy.ml/post/55143").unwrap();
- let community_json = file_to_json_object("assets/lemmy-community.json");
- let community = ApubCommunity::from_apub(&community_json, &context, &url, &mut 0)
- .await
- .unwrap();
- let person_json = file_to_json_object("assets/lemmy-person.json");
- let person = ApubPerson::from_apub(&person_json, &context, &url, &mut 0)
+ let mut request_counter = 0;
+ ApubPost::verify(&json, &url, &context, &mut request_counter)
.await
.unwrap();
- let json = file_to_json_object("assets/lemmy-post.json");
- let mut request_counter = 0;
- let post = ApubPost::from_apub(&json, &context, &url, &mut request_counter)
+ let post = ApubPost::from_apub(json, &context, &mut request_counter)
.await
.unwrap();
- assert_eq!(post.ap_id.clone().into_inner(), url);
+ assert_eq!(post.ap_id, url.into());
assert_eq!(post.name, "Post title");
assert!(post.body.is_some());
assert_eq!(post.body.as_ref().unwrap().len(), 45);
assert!(post.stickied);
assert_eq!(request_counter, 0);
- let to_apub = post.to_apub(&context).await.unwrap();
- assert_json_include!(actual: json, expected: to_apub);
-
- Post::delete(&*context.pool().get().unwrap(), post.id).unwrap();
- Person::delete(&*context.pool().get().unwrap(), person.id).unwrap();
- Community::delete(&*context.pool().get().unwrap(), community.id).unwrap();
+ Post::delete(conn, post.id).unwrap();
+ Person::delete(conn, person.id).unwrap();
+ Community::delete(conn, community.id).unwrap();
+ Site::delete(conn, site.id).unwrap();
}
}
projects / lemmy.git / blobdiff