use crate::{
activities::{verify_is_public, verify_person_in_community},
- check_is_apub_id_valid,
+ check_apub_id_valid_with_strictness,
+ local_instance,
mentions::collect_non_local_mentions,
- protocol::{
- objects::{
- note::{Note, SourceCompat},
- tombstone::Tombstone,
- },
- Source,
- },
+ objects::{read_from_string_or_source, verify_is_remote_object},
+ protocol::{objects::note::Note, Source},
PostOrComment,
};
-use activitystreams_kinds::{object::NoteType, public};
-use anyhow::anyhow;
-use chrono::NaiveDateTime;
-use html2md::parse_html;
-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, MediaTypeMarkdown},
- verify::verify_domains_match,
+ utils::verify_domains_match,
};
+use activitystreams_kinds::{object::NoteType, public};
+use chrono::NaiveDateTime;
+use lemmy_api_common::utils::blocking;
use lemmy_db_schema::{
source::{
comment::{Comment, CommentForm},
traits::Crud,
};
use lemmy_utils::{
+ error::LemmyError,
utils::{convert_datetime, markdown_to_html, remove_slurs},
- LemmyError,
};
use lemmy_websocket::LemmyContext;
use std::ops::Deref;
impl From<Comment> for ApubComment {
fn from(c: Comment) -> Self {
- ApubComment { 0: c }
+ ApubComment(c)
}
}
impl ApubObject for ApubComment {
type DataType = LemmyContext;
type ApubType = Note;
- type TombstoneType = Tombstone;
+ type DbType = Comment;
+ 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> {
if !self.deleted {
blocking(context.pool(), move |conn| {
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn into_apub(self, context: &LemmyContext) -> Result<Note, LemmyError> {
let creator_id = self.creator_id;
let creator = blocking(context.pool(), move |conn| Person::read(conn, creator_id)).await??;
})
.await??;
- let in_reply_to = if let Some(comment_id) = self.parent_id {
+ let in_reply_to = if let Some(comment_id) = self.parent_comment_id() {
let parent_comment =
blocking(context.pool(), move |conn| Comment::read(conn, comment_id)).await??;
ObjectId::<PostOrComment>::new(parent_comment.ap_id)
to: vec![public()],
cc: maa.ccs,
content: markdown_to_html(&self.content),
- media_type: Some(MediaTypeHtml::Html),
- source: SourceCompat::Lemmy(Source {
- content: self.content.clone(),
- media_type: MediaTypeMarkdown::Markdown,
- }),
+ media_type: Some(MediaTypeMarkdownOrHtml::Html),
+ source: Some(Source::new(self.content.clone())),
in_reply_to,
published: Some(convert_datetime(self.published)),
updated: self.updated.map(convert_datetime),
tag: maa.tags,
- unparsed: Default::default(),
};
Ok(note)
}
- fn to_tombstone(&self) -> Result<Tombstone, LemmyError> {
- Ok(Tombstone::new(self.ap_id.clone().into()))
- }
-
+ #[tracing::instrument(skip_all)]
async fn verify(
note: &Note,
expected_domain: &Url,
Community::read(conn, community_id)
})
.await??;
- check_is_apub_id_valid(note.id.inner(), community.local, &context.settings())?;
+ check_apub_id_valid_with_strictness(note.id.inner(), community.local, context.settings())?;
+ verify_is_remote_object(note.id.inner(), context.settings())?;
verify_person_in_community(
¬e.attributed_to,
&community.into(),
)
.await?;
if post.locked {
- return Err(anyhow!("Post is locked").into());
+ return Err(LemmyError::from_message("Post is locked"));
}
Ok(())
}
/// Converts a `Note` to `Comment`.
///
/// If the parent community, post and comment(s) are not known locally, these are also fetched.
+ #[tracing::instrument(skip_all)]
async fn from_apub(
note: Note,
context: &LemmyContext,
) -> Result<ApubComment, LemmyError> {
let creator = note
.attributed_to
- .dereference(context, request_counter)
+ .dereference(context, local_instance(context), request_counter)
.await?;
- let (post, parent_comment_id) = note.get_parents(context, request_counter).await?;
+ let (post, parent_comment) = note.get_parents(context, request_counter).await?;
- let content = if let SourceCompat::Lemmy(source) = ¬e.source {
- source.content.clone()
- } else {
- parse_html(¬e.content)
- };
+ let content = read_from_string_or_source(¬e.content, ¬e.media_type, ¬e.source);
let content_slurs_removed = remove_slurs(&content, &context.settings().slur_regex());
let form = CommentForm {
creator_id: creator.id,
post_id: post.id,
- parent_id: parent_comment_id,
content: content_slurs_removed,
removed: None,
- read: None,
published: note.published.map(|u| u.naive_local()),
updated: note.updated.map(|u| u.naive_local()),
deleted: None,
ap_id: Some(note.id.into()),
local: Some(false),
};
- let comment = blocking(context.pool(), move |conn| Comment::upsert(conn, &form)).await??;
+ let parent_comment_path = parent_comment.map(|t| t.0.path);
+ let comment = blocking(context.pool(), move |conn| {
+ Comment::create(conn, &form, parent_comment_path.as_ref())
+ })
+ .await??;
Ok(comment.into())
}
}
#[cfg(test)]
pub(crate) mod tests {
use super::*;
- use crate::objects::{
- community::{tests::parse_lemmy_community, ApubCommunity},
- person::{tests::parse_lemmy_person, ApubPerson},
- post::ApubPost,
- tests::{file_to_json_object, init_context},
+ use crate::{
+ objects::{
+ community::{tests::parse_lemmy_community, ApubCommunity},
+ instance::ApubSite,
+ person::{tests::parse_lemmy_person, ApubPerson},
+ post::ApubPost,
+ tests::init_context,
+ },
+ protocol::tests::file_to_json_object,
};
use assert_json_diff::assert_json_include;
- use lemmy_apub_lib::activity_queue::create_activity_queue;
+ use html2md::parse_html;
+ use lemmy_db_schema::source::site::Site;
use serial_test::serial;
async fn prepare_comment_test(
url: &Url,
context: &LemmyContext,
- ) -> (ApubPerson, ApubCommunity, ApubPost) {
- let person = parse_lemmy_person(context).await;
+ ) -> (ApubPerson, ApubCommunity, ApubPost, ApubSite) {
+ let (person, site) = parse_lemmy_person(context).await;
let community = parse_lemmy_community(context).await;
- let post_json = file_to_json_object("assets/lemmy/objects/page.json");
+ let post_json = file_to_json_object("assets/lemmy/objects/page.json").unwrap();
ApubPost::verify(&post_json, url, context, &mut 0)
.await
.unwrap();
let post = ApubPost::from_apub(post_json, context, &mut 0)
.await
.unwrap();
- (person, community, post)
+ (person, community, post, site)
}
- fn cleanup(data: (ApubPerson, ApubCommunity, ApubPost), context: &LemmyContext) {
+ fn cleanup(data: (ApubPerson, ApubCommunity, ApubPost, ApubSite), context: &LemmyContext) {
Post::delete(&*context.pool().get().unwrap(), data.2.id).unwrap();
Community::delete(&*context.pool().get().unwrap(), data.1.id).unwrap();
Person::delete(&*context.pool().get().unwrap(), data.0.id).unwrap();
+ Site::delete(&*context.pool().get().unwrap(), data.3.id).unwrap();
}
#[actix_rt::test]
#[serial]
pub(crate) async fn test_parse_lemmy_comment() {
- let manager = create_activity_queue();
- let context = init_context(manager.queue_handle().clone());
+ let context = init_context();
let url = Url::parse("https://enterprise.lemmy.ml/comment/38741").unwrap();
let data = prepare_comment_test(&url, &context).await;
- let json: Note = file_to_json_object("assets/lemmy/objects/note.json");
+ let json: Note = file_to_json_object("assets/lemmy/objects/note.json").unwrap();
let mut request_counter = 0;
ApubComment::verify(&json, &url, &context, &mut request_counter)
.await
#[actix_rt::test]
#[serial]
async fn test_parse_pleroma_comment() {
- let manager = create_activity_queue();
- let context = init_context(manager.queue_handle().clone());
+ let context = init_context();
let url = Url::parse("https://enterprise.lemmy.ml/comment/38741").unwrap();
let data = prepare_comment_test(&url, &context).await;
let pleroma_url =
Url::parse("https://queer.hacktivis.me/objects/8d4973f4-53de-49cd-8c27-df160e16a9c2")
.unwrap();
- let person_json = file_to_json_object("assets/pleroma/objects/person.json");
+ let person_json = file_to_json_object("assets/pleroma/objects/person.json").unwrap();
ApubPerson::verify(&person_json, &pleroma_url, &context, &mut 0)
.await
.unwrap();
ApubPerson::from_apub(person_json, &context, &mut 0)
.await
.unwrap();
- let json = file_to_json_object("assets/pleroma/objects/note.json");
+ let json = file_to_json_object("assets/pleroma/objects/note.json").unwrap();
let mut request_counter = 0;
ApubComment::verify(&json, &pleroma_url, &context, &mut request_counter)
.await
projects / lemmy.git / blobdiff