use crate::{
- activities::verify_person_in_community,
+ activities::{verify_is_public, verify_person_in_community},
check_is_apub_id_valid,
protocol::{
- objects::{page::Page, tombstone::Tombstone},
+ objects::{
+ page::{Page, PageType},
+ tombstone::Tombstone,
+ },
ImageObject,
Source,
},
};
-use activitystreams::{
- object::kind::{ImageType, PageType},
- public,
-};
+use activitystreams_kinds::public;
use chrono::NaiveDateTime;
use lemmy_api_common::blocking;
use lemmy_apub_lib::{
};
use lemmy_utils::{
request::fetch_site_data,
- utils::{convert_datetime, markdown_to_html, remove_slurs},
+ utils::{check_slurs, convert_datetime, markdown_to_html, remove_slurs},
LemmyError,
};
use lemmy_websocket::LemmyContext;
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> {
if !self.deleted {
blocking(context.pool(), move |conn| {
}
// 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;
content: body,
media_type: MediaTypeMarkdown::Markdown,
});
- let image = self.thumbnail_url.clone().map(|thumb| ImageObject {
- kind: ImageType::Image,
- url: thumb.into(),
- });
+ let image = self.thumbnail_url.clone().map(ImageObject::new);
let page = Page {
r#type: PageType::Page,
id: ObjectId::new(self.ap_id.clone()),
attributed_to: 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),
}
fn to_tombstone(&self) -> Result<Tombstone, LemmyError> {
- Ok(Tombstone::new(
- PageType::Page,
- self.updated.unwrap_or(self.published),
- ))
+ Ok(Tombstone::new(self.ap_id.clone().into()))
}
- 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.
if !page.is_mod_action(context).await? {
verify_domains_match(page.id.inner(), expected_domain)?;
};
- let ap_id = Some(page.id.clone().into());
+
+ 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_slurs(&page.name, &context.settings().slur_regex())?;
+ verify_domains_match(page.attributed_to.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)
+ .dereference(context, context.client(), request_counter)
.await?;
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?;
- let thumbnail_url: Option<Url> = page.image.clone().map(|i| i.url);
+ let thumbnail_url: Option<Url> = page.image.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
} else {
.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()),
+ name: page.name,
+ url: page.url.map(|u| u.into()),
body: body_slurs_removed,
creator_id: creator.id,
community_id: community.id,
embed_description,
embed_html,
thumbnail_url: pictrs_thumbnail.map(|u| u.into()),
- ap_id,
+ ap_id: Some(page.id.into()),
local: Some(false),
};
let post = blocking(context.pool(), move |conn| Post::upsert(conn, &form)).await??;
post::ApubPost,
tests::{file_to_json_object, init_context},
};
+ use lemmy_apub_lib::activity_queue::create_activity_queue;
+ 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 client = reqwest::Client::new().into();
+ let manager = create_activity_queue(client);
+ let context = init_context(manager.queue_handle().clone());
+ let (person, site) = parse_lemmy_person(&context).await;
let community = parse_lemmy_community(&context).await;
- let person = parse_lemmy_person(&context).await;
- let json = file_to_json_object("assets/lemmy/objects/page.json");
+ let json = file_to_json_object("assets/lemmy/objects/page.json").unwrap();
let url = Url::parse("https://enterprise.lemmy.ml/post/55143").unwrap();
let mut request_counter = 0;
- let post = ApubPost::from_apub(&json, &context, &url, &mut request_counter)
+ ApubPost::verify(&json, &url, &context, &mut request_counter)
+ .await
+ .unwrap();
+ let post = ApubPost::from_apub(json, &context, &mut request_counter)
.await
.unwrap();
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();
}
}
projects / lemmy.git / blobdiff