X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fobjects%2Fprivate_message.rs;h=9a92b0b5197f0bad2af93bef2e0c4b7bb8e30b0a;hb=ee7b35a04af4a200e25893249d8a32d4ceeea2b0;hp=bd9cc1da479ae16a2aca4cb39be5eef009790c58;hpb=149a4e0de88f82b6378c044423bf7d628108fc86;p=lemmy.git

diff --git a/crates/apub/src/objects/private_message.rs b/crates/apub/src/objects/private_message.rs
index bd9cc1da..9a92b0b5 100644
--- a/crates/apub/src/objects/private_message.rs
+++ b/crates/apub/src/objects/private_message.rs
@@ -1,92 +1,37 @@
 use crate::{
-  context::lemmy_context,
-  fetcher::object_id::ObjectId,
-  objects::{create_tombstone, person::ApubPerson, Source},
+  check_apub_id_valid_with_strictness,
+  objects::read_from_string_or_source,
+  protocol::{
+    objects::chat_message::{ChatMessage, ChatMessageType},
+    Source,
+  },
 };
-use activitystreams::{
-  base::AnyBase,
-  chrono::NaiveDateTime,
-  object::{kind::NoteType, Tombstone},
-  primitives::OneOrMany,
-  unparsed::Unparsed,
+use activitypub_federation::{
+  config::Data,
+  protocol::{values::MediaTypeHtml, verification::verify_domains_match},
+  traits::Object,
 };
-use anyhow::anyhow;
-use chrono::{DateTime, FixedOffset};
-use html2md::parse_html;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
-  traits::{ApubObject, FromApub, ToApub},
-  values::{MediaTypeHtml, MediaTypeMarkdown},
-  verify::verify_domains_match,
+use chrono::NaiveDateTime;
+use lemmy_api_common::{
+  context::LemmyContext,
+  utils::{check_person_block, sanitize_html},
 };
 use lemmy_db_schema::{
   source::{
     person::Person,
-    private_message::{PrivateMessage, PrivateMessageForm},
+    private_message::{PrivateMessage, PrivateMessageInsertForm},
   },
   traits::Crud,
-  DbPool,
 };
-use lemmy_utils::{utils::convert_datetime, LemmyError};
-use lemmy_websocket::LemmyContext;
-use serde::{Deserialize, Serialize};
-use serde_with::skip_serializing_none;
+use lemmy_utils::{
+  error::{LemmyError, LemmyErrorType},
+  utils::{markdown::markdown_to_html, time::convert_datetime},
+};
 use std::ops::Deref;
 use url::Url;
 
-#[skip_serializing_none]
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Note {
-  #[serde(rename = "@context")]
-  context: OneOrMany<AnyBase>,
-  r#type: ChatMessageType,
-  id: Url,
-  pub(crate) attributed_to: ObjectId<ApubPerson>,
-  to: [ObjectId<ApubPerson>; 1],
-  content: String,
-  media_type: Option<MediaTypeHtml>,
-  source: Option<Source>,
-  published: Option<DateTime<FixedOffset>>,
-  updated: Option<DateTime<FixedOffset>>,
-  #[serde(flatten)]
-  unparsed: Unparsed,
-}
-
-/// https://docs.pleroma.social/backend/development/ap_extensions/#chatmessages
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum ChatMessageType {
-  ChatMessage,
-}
-
-impl Note {
-  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)
-  }
-
-  pub(crate) async fn verify(
-    &self,
-    context: &LemmyContext,
-    request_counter: &mut i32,
-  ) -> Result<(), LemmyError> {
-    verify_domains_match(self.attributed_to.inner(), &self.id)?;
-    let person = self
-      .attributed_to
-      .dereference(context, request_counter)
-      .await?;
-    if person.banned {
-      return Err(anyhow!("Person is banned from site").into());
-    }
-    Ok(())
-  }
-}
-
 #[derive(Clone, Debug)]
-pub struct ApubPrivateMessage(PrivateMessage);
+pub struct ApubPrivateMessage(pub(crate) PrivateMessage);
 
 impl Deref for ApubPrivateMessage {
   type Target = PrivateMessage;
@@ -97,187 +42,206 @@ impl Deref for ApubPrivateMessage {
 
 impl From<PrivateMessage> for ApubPrivateMessage {
   fn from(pm: PrivateMessage) -> Self {
-    ApubPrivateMessage { 0: pm }
+    ApubPrivateMessage(pm)
   }
 }
 
-#[async_trait::async_trait(?Send)]
-impl ApubObject for ApubPrivateMessage {
+#[async_trait::async_trait]
+impl Object for ApubPrivateMessage {
   type DataType = LemmyContext;
+  type Kind = ChatMessage;
+  type Error = LemmyError;
 
   fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
     None
   }
 
-  async fn read_from_apub_id(
+  #[tracing::instrument(skip_all)]
+  async fn read_from_id(
     object_id: Url,
-    context: &LemmyContext,
+    context: &Data<Self::DataType>,
   ) -> Result<Option<Self>, LemmyError> {
     Ok(
-      blocking(context.pool(), move |conn| {
-        PrivateMessage::read_from_apub_id(conn, object_id)
-      })
-      .await??
-      .map(Into::into),
+      PrivateMessage::read_from_apub_id(&mut context.pool(), object_id)
+        .await?
+        .map(Into::into),
     )
   }
 
-  async fn delete(self, _context: &LemmyContext) -> Result<(), LemmyError> {
+  async fn delete(self, _context: &Data<Self::DataType>) -> Result<(), LemmyError> {
     // do nothing, because pm can't be fetched over http
     unimplemented!()
   }
-}
-
-#[async_trait::async_trait(?Send)]
-impl ToApub for ApubPrivateMessage {
-  type ApubType = Note;
-  type TombstoneType = Tombstone;
-  type DataType = DbPool;
 
-  async fn to_apub(&self, pool: &DbPool) -> Result<Note, LemmyError> {
+  #[tracing::instrument(skip_all)]
+  async fn into_json(self, context: &Data<Self::DataType>) -> Result<ChatMessage, LemmyError> {
     let creator_id = self.creator_id;
-    let creator = blocking(pool, move |conn| Person::read(conn, creator_id)).await??;
+    let creator = Person::read(&mut context.pool(), creator_id).await?;
 
     let recipient_id = self.recipient_id;
-    let recipient = blocking(pool, move |conn| Person::read(conn, recipient_id)).await??;
+    let recipient = Person::read(&mut context.pool(), recipient_id).await?;
 
-    let note = Note {
-      context: lemmy_context(),
+    let note = ChatMessage {
       r#type: ChatMessageType::ChatMessage,
       id: self.ap_id.clone().into(),
-      attributed_to: ObjectId::new(creator.actor_id),
-      to: [ObjectId::new(recipient.actor_id)],
-      content: self.content.clone(),
+      attributed_to: creator.actor_id.into(),
+      to: [recipient.actor_id.into()],
+      content: markdown_to_html(&self.content),
       media_type: Some(MediaTypeHtml::Html),
-      source: Some(Source {
-        content: self.content.clone(),
-        media_type: MediaTypeMarkdown::Markdown,
-      }),
+      source: Some(Source::new(self.content.clone())),
       published: Some(convert_datetime(self.published)),
       updated: self.updated.map(convert_datetime),
-      unparsed: Default::default(),
     };
     Ok(note)
   }
 
-  fn to_tombstone(&self) -> Result<Tombstone, LemmyError> {
-    create_tombstone(
-      self.deleted,
-      self.ap_id.to_owned().into(),
-      self.updated,
-      NoteType::Note,
-    )
-  }
-}
+  #[tracing::instrument(skip_all)]
+  async fn verify(
+    note: &ChatMessage,
+    expected_domain: &Url,
+    context: &Data<Self::DataType>,
+  ) -> Result<(), LemmyError> {
+    verify_domains_match(note.id.inner(), expected_domain)?;
+    verify_domains_match(note.attributed_to.inner(), note.id.inner())?;
 
-#[async_trait::async_trait(?Send)]
-impl FromApub for ApubPrivateMessage {
-  type ApubType = Note;
-  type DataType = LemmyContext;
+    check_apub_id_valid_with_strictness(note.id.inner(), false, context).await?;
+    let person = note.attributed_to.dereference(context).await?;
+    if person.banned {
+      return Err(LemmyErrorType::PersonIsBannedFromSite(
+        person.actor_id.to_string(),
+      ))?;
+    }
+    Ok(())
+  }
 
-  async fn from_apub(
-    note: &Note,
-    context: &LemmyContext,
-    expected_domain: &Url,
-    request_counter: &mut i32,
+  #[tracing::instrument(skip_all)]
+  async fn from_json(
+    note: ChatMessage,
+    context: &Data<Self::DataType>,
   ) -> Result<ApubPrivateMessage, LemmyError> {
-    let ap_id = Some(note.id(expected_domain)?.clone().into());
-    let creator = note
-      .attributed_to
-      .dereference(context, request_counter)
-      .await?;
-    let recipient = note.to[0].dereference(context, request_counter).await?;
-    let content = if let Some(source) = &note.source {
-      source.content.clone()
-    } else {
-      parse_html(&note.content)
-    };
+    let creator = note.attributed_to.dereference(context).await?;
+    let recipient = note.to[0].dereference(context).await?;
+    check_person_block(creator.id, recipient.id, &mut context.pool()).await?;
+
+    let content = read_from_string_or_source(&note.content, &None, &note.source);
+    let content = sanitize_html(&content);
 
-    let form = PrivateMessageForm {
+    let form = PrivateMessageInsertForm {
       creator_id: creator.id,
       recipient_id: recipient.id,
       content,
-      published: note.published.map(|u| u.to_owned().naive_local()),
-      updated: note.updated.map(|u| u.to_owned().naive_local()),
-      deleted: None,
+      published: note.published.map(|u| u.naive_local()),
+      updated: note.updated.map(|u| u.naive_local()),
+      deleted: Some(false),
       read: None,
-      ap_id,
+      ap_id: Some(note.id.into()),
       local: Some(false),
     };
-    let pm = blocking(context.pool(), move |conn| {
-      PrivateMessage::upsert(conn, &form)
-    })
-    .await??;
+    let pm = PrivateMessage::create(&mut context.pool(), &form).await?;
     Ok(pm.into())
   }
 }
 
 #[cfg(test)]
 mod tests {
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
   use super::*;
-  use crate::objects::tests::{file_to_json_object, init_context};
+  use crate::{
+    objects::{
+      instance::{tests::parse_lemmy_instance, ApubSite},
+      person::ApubPerson,
+      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;
 
-  async fn prepare_comment_test(url: &Url, context: &LemmyContext) -> (ApubPerson, ApubPerson) {
-    let lemmy_person = file_to_json_object("assets/lemmy-person.json");
-    let person1 = ApubPerson::from_apub(&lemmy_person, context, url, &mut 0)
+  async fn prepare_comment_test(
+    url: &Url,
+    context: &Data<LemmyContext>,
+  ) -> (ApubPerson, ApubPerson, ApubSite) {
+    let context2 = context.reset_request_count();
+    let lemmy_person = file_to_json_object("assets/lemmy/objects/person.json").unwrap();
+    let site = parse_lemmy_instance(&context2).await;
+    ApubPerson::verify(&lemmy_person, url, &context2)
       .await
       .unwrap();
-    let pleroma_person = file_to_json_object("assets/pleroma-person.json");
+    let person1 = ApubPerson::from_json(lemmy_person, &context2)
+      .await
+      .unwrap();
+    let pleroma_person = file_to_json_object("assets/pleroma/objects/person.json").unwrap();
     let pleroma_url = Url::parse("https://queer.hacktivis.me/users/lanodan").unwrap();
-    let person2 = ApubPerson::from_apub(&pleroma_person, context, &pleroma_url, &mut 0)
+    ApubPerson::verify(&pleroma_person, &pleroma_url, &context2)
       .await
       .unwrap();
-    (person1, person2)
+    let person2 = ApubPerson::from_json(pleroma_person, &context2)
+      .await
+      .unwrap();
+    (person1, person2, site)
   }
 
-  fn cleanup(data: (ApubPerson, ApubPerson), context: &LemmyContext) {
-    Person::delete(&*context.pool().get().unwrap(), data.0.id).unwrap();
-    Person::delete(&*context.pool().get().unwrap(), data.1.id).unwrap();
+  async fn cleanup(data: (ApubPerson, ApubPerson, ApubSite), context: &Data<LemmyContext>) {
+    Person::delete(&mut context.pool(), data.0.id)
+      .await
+      .unwrap();
+    Person::delete(&mut context.pool(), data.1.id)
+      .await
+      .unwrap();
+    Site::delete(&mut context.pool(), data.2.id).await.unwrap();
   }
 
-  #[actix_rt::test]
+  #[tokio::test]
   #[serial]
   async fn test_parse_lemmy_pm() {
-    let context = init_context();
+    let context = init_context().await;
     let url = Url::parse("https://enterprise.lemmy.ml/private_message/1621").unwrap();
     let data = prepare_comment_test(&url, &context).await;
-    let json = file_to_json_object("assets/lemmy-private-message.json");
-    let mut request_counter = 0;
-    let pm = ApubPrivateMessage::from_apub(&json, &context, &url, &mut request_counter)
+    let json: ChatMessage = file_to_json_object("assets/lemmy/objects/chat_message.json").unwrap();
+    ApubPrivateMessage::verify(&json, &url, &context)
+      .await
+      .unwrap();
+    let pm = ApubPrivateMessage::from_json(json.clone(), &context)
       .await
       .unwrap();
 
-    assert_eq!(pm.ap_id.clone().into_inner(), url);
+    assert_eq!(pm.ap_id.clone(), url.into());
     assert_eq!(pm.content.len(), 20);
-    assert_eq!(request_counter, 0);
+    assert_eq!(context.request_count(), 0);
 
-    let to_apub = pm.to_apub(context.pool()).await.unwrap();
+    let pm_id = pm.id;
+    let to_apub = pm.into_json(&context).await.unwrap();
     assert_json_include!(actual: json, expected: to_apub);
 
-    PrivateMessage::delete(&*context.pool().get().unwrap(), pm.id).unwrap();
-    cleanup(data, &context);
+    PrivateMessage::delete(&mut context.pool(), pm_id)
+      .await
+      .unwrap();
+    cleanup(data, &context).await;
   }
 
-  #[actix_rt::test]
+  #[tokio::test]
   #[serial]
   async fn test_parse_pleroma_pm() {
-    let context = init_context();
+    let context = init_context().await;
     let url = Url::parse("https://enterprise.lemmy.ml/private_message/1621").unwrap();
     let data = prepare_comment_test(&url, &context).await;
     let pleroma_url = Url::parse("https://queer.hacktivis.me/objects/2").unwrap();
-    let json = file_to_json_object("assets/pleroma-private-message.json");
-    let mut request_counter = 0;
-    let pm = ApubPrivateMessage::from_apub(&json, &context, &pleroma_url, &mut request_counter)
+    let json = file_to_json_object("assets/pleroma/objects/chat_message.json").unwrap();
+    ApubPrivateMessage::verify(&json, &pleroma_url, &context)
       .await
       .unwrap();
+    let pm = ApubPrivateMessage::from_json(json, &context).await.unwrap();
 
-    assert_eq!(pm.ap_id.clone().into_inner(), pleroma_url);
+    assert_eq!(pm.ap_id, pleroma_url.into());
     assert_eq!(pm.content.len(), 3);
-    assert_eq!(request_counter, 0);
+    assert_eq!(context.request_count(), 0);
 
-    PrivateMessage::delete(&*context.pool().get().unwrap(), pm.id).unwrap();
-    cleanup(data, &context);
+    PrivateMessage::delete(&mut context.pool(), pm.id)
+      .await
+      .unwrap();
+    cleanup(data, &context).await;
   }
 }