use crate::{
activities::{verify_is_public, verify_person_in_community},
- check_is_apub_id_valid,
- objects::read_from_string_or_source_opt,
+ check_apub_id_valid_with_strictness,
+ local_instance,
+ objects::{read_from_string_or_source_opt, verify_is_remote_object},
protocol::{
objects::{
- page::{Attachment, Page, PageType},
- tombstone::Tombstone,
+ page::{Attachment, AttributedTo, Page, PageType},
+ LanguageTag,
},
ImageObject,
Source,
},
};
-use activitystreams_kinds::public;
-use chrono::NaiveDateTime;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
- object_id::ObjectId,
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ deser::values::MediaTypeMarkdownOrHtml,
traits::ApubObject,
- values::MediaTypeHtml,
- 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::{
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 std::ops::Deref;
type DataType = LemmyContext;
type ApubType = Page;
type DbType = Post;
- type TombstoneType = Tombstone;
+ type Error = LemmyError;
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
None
Community::read(conn, community_id)
})
.await??;
+ let language = LanguageTag::new_single(self.language_id, context.pool()).await?;
let page = Page {
- r#type: PageType::Page,
+ kind: PageType::Page,
id: ObjectId::new(self.ap_id.clone()),
- attributed_to: ObjectId::new(creator.actor_id),
+ 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),
+ media_type: Some(MediaTypeMarkdownOrHtml::Html),
source: self.body.clone().map(Source::new),
url: self.url.clone().map(|u| u.into()),
attachment: self.url.clone().map(Attachment::new).into_iter().collect(),
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),
};
Ok(page)
}
- fn to_tombstone(&self) -> Result<Tombstone, LemmyError> {
- Ok(Tombstone::new(self.ap_id.clone().into()))
- }
-
#[tracing::instrument(skip_all)]
async fn verify(
page: &Page,
// instance from the post author.
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 community = page.extract_community(context, request_counter).await?;
- check_is_apub_id_valid(page.id.inner(), community.local, &context.settings())?;
- verify_person_in_community(&page.attributed_to, &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.attributed_to.inner(), page.id.inner())?;
+ verify_domains_match(page.creator()?.inner(), page.id.inner())?;
verify_is_public(&page.to, &page.cc)?;
Ok(())
}
request_counter: &mut i32,
) -> Result<ApubPost, LemmyError> {
let creator = page
- .attributed_to
- .dereference(context, context.client(), request_counter)
+ .creator()?
+ .dereference(context, local_instance(context), request_counter)
.await?;
let community = page.extract_community(context, request_counter).await?;
- let url = if let Some(attachment) = page.attachment.first() {
- Some(attachment.href.clone())
- } else {
- page.url
- };
- let thumbnail_url: Option<Url> = page.image.map(|i| i.url);
- let (metadata_res, pictrs_thumbnail) = if let Some(url) = &url {
- fetch_site_data(context.client(), &context.settings(), Some(url)).await
- } else {
- (None, thumbnail_url)
- };
- 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 = read_from_string_or_source_opt(&page.content, &page.source)
- .map(|s| remove_slurs(&s, &context.settings().slur_regex()));
+ 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?;
- let form = PostForm {
- name: page.name.clone(),
- url: 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_html,
- thumbnail_url: pictrs_thumbnail.map(|u| u.into()),
- ap_id: Some(page.id.clone().into()),
- local: Some(false),
+ 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 {
+ // 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()
+ }
};
// read existing, local post if any (for generating mod log)
#[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;
assert!(post.stickied);
assert_eq!(request_counter, 0);
- 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();
- Site::delete(&*context.pool().get().unwrap(), site.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();
}
}